From 002cb5d2c884793da85b8389a8283f3036438119 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Thu, 8 Dec 2011 13:49:36 +0000 Subject: Fix unstable test case tst_QTcpSocket::disconnectWhileLookingUp required the host lookup + connect + disconnect procedure to complete in <50ms, which is not always true. When disconnecting (rather than aborting with close()), wait for the disconnection to complete with a timeout of 5 seconds. Task-number: QTBUG-21043 Change-Id: I3b59abf9a8eb2c6d99416e1a8ec6b528885b656e Reviewed-by: Robin Burchell Reviewed-by: Bradley T. Hughes --- tests/auto/network/socket/qtcpsocket/test/test.pro | 2 -- tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 13c39471b3..897a875013 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -24,5 +24,3 @@ win32 { } else { DESTDIR = ../ } - -CONFIG+=insignificant_test # unstable, QTBUG-21043 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index b50a427dc3..09bf8c98be 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -1272,6 +1272,7 @@ void tst_QTcpSocket::disconnectWhileLookingUp() } else { socket->disconnectFromHost(); QVERIFY(socket->openMode() == QIODevice::ReadWrite); + QVERIFY(socket->waitForDisconnected(5000)); } // let anything queued happen -- cgit v1.2.3