diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-21 07:31:51 (GMT) |
| commit | 47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743 (patch) | |
| tree | e8518206ec161750de9722aee17eb82805cca061 /tests/auto/qnetworkreply | |
| parent | 0987e68043e174a2a033b58d065c6069c0cf8a1a (diff) | |
| parent | a064fe66f5256c7ded6f3df87f503aa0fb8e341b (diff) | |
| download | Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.zip Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.gz Qt-47cbde8e5fbb7f0c4dc197c2ef241f5ba9fe2743.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qnetworkreply')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 555ab34..b4e596f 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -2689,7 +2689,8 @@ void tst_QNetworkReply::downloadProgress() QVERIFY(spy.isValid()); QCoreApplication::instance()->processEvents(); - server.waitForNewConnection(0); // ignore result, since processEvents may have got it + if (!server.hasPendingConnections()) + server.waitForNewConnection(1000); QVERIFY(server.hasPendingConnections()); QCOMPARE(spy.count(), 0); @@ -2756,7 +2757,8 @@ void tst_QNetworkReply::uploadProgress() QVERIFY(finished.isValid()); QCoreApplication::instance()->processEvents(); - server.waitForNewConnection(0); // ignore result, since processEvents may have got it + if (!server.hasPendingConnections()) + server.waitForNewConnection(1000); QVERIFY(server.hasPendingConnections()); QTcpSocket *receiver = server.nextPendingConnection(); |