summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2009-10-27 15:04:29 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2009-10-27 15:38:38 (GMT)
commit2d0b29c312ddf422595ce9debb3678bb5c4d51b6 (patch)
treecc9a88dcdfbc10db62c9ff9f9cb930d1e805f171 /tests
parentd0b0e0ed8ac857d78e497b74bb1c3596273c53ba (diff)
downloadQt-2d0b29c312ddf422595ce9debb3678bb5c4d51b6.zip
Qt-2d0b29c312ddf422595ce9debb3678bb5c4d51b6.tar.gz
Qt-2d0b29c312ddf422595ce9debb3678bb5c4d51b6.tar.bz2
QAbstractSocket: wait with closing until all bytes have been written
only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 2bd1684..db46b66 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -1755,9 +1755,7 @@ void tst_QSslSocket::readFromClosedSocket()
socket->close();
QVERIFY(!socket->bytesAvailable());
QVERIFY(!socket->bytesToWrite());
- socket->waitForDisconnected();
- QVERIFY(!socket->bytesAvailable());
- QVERIFY(!socket->bytesToWrite());
+ QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
}
void tst_QSslSocket::writeBigChunk()