diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 08:46:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 08:46:18 (GMT) |
| commit | 02fcd5e346da13cbb65523de2348880cf7d7a073 (patch) | |
| tree | b125e523779c96d5cf4f2ec94eedfc71d398b3ea /tests | |
| parent | 4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc (diff) | |
| parent | 4e9eb911ffc70959d81de01fe9fe4a704cafe3eb (diff) | |
| download | Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.zip Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.tar.gz Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fix QLocalSocket::isValid() on Windows
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index a6d4427..77a5574 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -391,6 +391,8 @@ void tst_QLocalSocket::listenAndConnect() QVERIFY(socket->fullServerName().contains(name)); sockets.append(socket); if (canListen) { + QVERIFY(socket->waitForConnected()); + QVERIFY(socket->isValid()); QCOMPARE(socket->errorString(), QString("Unknown error")); QCOMPARE(socket->error(), QLocalSocket::UnknownSocketError); QCOMPARE(socket->state(), QLocalSocket::ConnectedState); |