diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-04-13 05:23:28 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-04-13 05:23:28 (GMT) |
| commit | 7fba97dc74a27f836abfcf4941dac6e247379798 (patch) | |
| tree | ad54e31c2650593c742652c75a73f984c2111e08 /tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | |
| parent | 36e8506084f272a01cfdc50ab787e9d30da60360 (diff) | |
| parent | bae8e41ff7d12ac10f69a4f03d97e736dace500d (diff) | |
| download | Qt-7fba97dc74a27f836abfcf4941dac6e247379798.zip Qt-7fba97dc74a27f836abfcf4941dac6e247379798.tar.gz Qt-7fba97dc74a27f836abfcf4941dac6e247379798.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
Diffstat (limited to 'tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp')
| -rw-r--r-- | tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp index ca12f2a..3a3ea79 100644 --- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -506,7 +506,8 @@ void tst_QHttpSocketEngine::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()) { |