summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-16 12:32:27 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-16 12:32:58 (GMT)
commitb31559b05ad50a228a4a2670034a8a99681722da (patch)
tree379fffceb578f25e0624a959a41d09c958f5f634 /tests
parent5c48202a1a3618e71a56d957f0170827543dd3f3 (diff)
downloadQt-b31559b05ad50a228a4a2670034a8a99681722da.zip
Qt-b31559b05ad50a228a4a2670034a8a99681722da.tar.gz
Qt-b31559b05ad50a228a4a2670034a8a99681722da.tar.bz2
Other fixes to the remote network stresstester
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
index f9f2730..2f0bc2c 100644
--- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
+++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp
@@ -142,7 +142,7 @@ void tst_NetworkRemoteStressTest::initTestCase_data()
QTest::addColumn<QVector<QUrl> >("urlList");
QTest::addColumn<bool>("useSslSocket");
-// QTest::newRow("no-ssl") << httpUrls << false;
+ QTest::newRow("no-ssl") << httpUrls << false;
// QTest::newRow("no-ssl-in-sslsocket") << httpUrls << true;
QTest::newRow("ssl") << httpsUrls << true;
QTest::newRow("mixed") << mixedUrls << false;
@@ -404,13 +404,12 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts()
if (done == sockets.size())
break;
}
- if (timeout.hasExpired(10000)) {
- for (int j = 0; j < sockets.size(); ++j)
- if (sockets[j]->state() != QAbstractSocket::UnconnectedState)
- qDebug() << "Socket to" << sockets[j]->property("remoteUrl").toUrl() << "still open with"
- << sockets[j]->bytesToWrite() << "bytes to write";
- QFAIL("Timed out");
- }
+ for (int j = 0; j < sockets.size(); ++j)
+ if (sockets[j]->state() != QAbstractSocket::UnconnectedState) {
+ qDebug() << "Socket to" << sockets[j]->property("remoteUrl").toUrl() << "still open with"
+ << sockets[j]->bytesToWrite() << "bytes to write";
+ QFAIL("Timed out");
+ }
totalBytes += byteCounter;
if (intermediateDebug) {