From 000025ca1ecabe363934bdc8794b01ffb926af66 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 2 Nov 2012 12:25:58 +0100 Subject: [PATCH] speed up tst_QLocalSocket::readBufferOverflow Ifdef out waitForBytesWritten on Windows. See comment in source. Change-Id: I7a2268d2634c2524cd8291c72dd9708e430e314e Reviewed-by: Oswald Buddenhagen --- tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 4f6fc46..ed00d7d 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -555,7 +555,16 @@ void tst_QLocalSocket::readBufferOverflow() char buffer[dataBufferSize]; memset(buffer, 0, dataBufferSize); serverSocket->write(buffer, dataBufferSize); +#ifndef Q_OS_WIN + // The data is not immediately sent, but buffered. + // On Windows, the flushing is done asynchronously by a separate thread. + // However, this operation will never complete as long as the data is not + // read by the other end, so the call below always times out. + // On Unix, the flushing is synchronous and thus needs to be done before + // attempting to read the data in the same thread. Buffering by the OS + // prevents the deadlock seen on Windows. serverSocket->waitForBytesWritten(); +#endif // wait until the first 128 bytes are ready to read QVERIFY(client.waitForReadyRead()); -- 2.7.4