summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-09 15:29:42 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-09 15:30:08 (GMT)
commitcd5bfb680ce61d4cbe6081664494ee1046fce69a (patch)
tree426021a1b178947200de421c0aa4bf5fc03cc6a9
parent9fd909e427b6d7c6a7d20b5cd28c9d860c52b73a (diff)
downloadQt-cd5bfb680ce61d4cbe6081664494ee1046fce69a.zip
Qt-cd5bfb680ce61d4cbe6081664494ee1046fce69a.tar.gz
Qt-cd5bfb680ce61d4cbe6081664494ee1046fce69a.tar.bz2
Autotest: same as previous commit
-rw-r--r--tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp3
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()) {