diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
| commit | add41080b9a4e2319007063bd73447f336933e9e (patch) | |
| tree | 2b5bcbf18d4a0b3dc96043a430830c8212e85749 /tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp | |
| parent | 1055099e331af3b10d0b81b1a965e7d3db5f272d (diff) | |
| parent | fbacd0fb2eb41470b090a3cbca7535f78689a382 (diff) | |
| download | Qt-add41080b9a4e2319007063bd73447f336933e9e.zip Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.gz Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp')
| -rw-r--r-- | tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp index 0240a0e..a679765 100644 --- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -647,7 +647,8 @@ void tst_QSocks5SocketEngine::tcpSocketNonBlockingTest() // Connect socket.connectToHost(QtNetworkSettings::serverName(), 143); - QCOMPARE(socket.state(), QTcpSocket::HostLookupState); + QVERIFY(socket.state() == QTcpSocket::HostLookupState || + socket.state() == QTcpSocket::ConnectingState); QTestEventLoop::instance().enterLoop(30); if (QTestEventLoop::instance().timeout()) { |