From b31559b05ad50a228a4a2670034a8a99681722da Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 16 Apr 2010 14:32:27 +0200 Subject: Other fixes to the remote network stresstester --- .../tst_network_remote_stresstest.cpp | 15 +++++++-------- 1 file 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 >("urlList"); QTest::addColumn("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) { -- cgit v0.12