diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-11 16:59:48 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-15 09:52:35 (GMT) |
| commit | 230ef5e3ad8bb4dadef7dbf2c8bf41156bf30130 (patch) | |
| tree | c8b4a501cf805bfa1cf350e6f21fbf948c953c21 | |
| parent | 479f234ec89db7e5916c27a7eac234d2ee8833c1 (diff) | |
| download | Qt-230ef5e3ad8bb4dadef7dbf2c8bf41156bf30130.zip Qt-230ef5e3ad8bb4dadef7dbf2c8bf41156bf30130.tar.gz Qt-230ef5e3ad8bb4dadef7dbf2c8bf41156bf30130.tar.bz2 | |
tst_QNetworkReply::ioGetFromBuiltinHttp issues
The https:limited subtest was too slow and didn't fail in the expected
place (it was expected to be too fast)
Both limited test cases timed out when debug enabled in the socket engine,
so the timeout is increased from 11->30 seconds
Reviewed-by: Markus Goetz
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 7fde3f8..ffe7ea4 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -3846,7 +3846,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp() connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); QTime loopTime; loopTime.start(); - QTestEventLoop::instance().enterLoop(11); + QTestEventLoop::instance().enterLoop(30); const int elapsedTime = loopTime.elapsed(); server.wait(); reader.wrapUp(); @@ -3878,10 +3878,9 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp() const int minRate = rate * 1024 * (100-allowedDeviation) / 100; const int maxRate = rate * 1024 * (100+allowedDeviation) / 100; qDebug() << minRate << "<="<< server.transferRate << "<=" << maxRate << "?"; - QVERIFY(server.transferRate >= minRate); QEXPECT_FAIL("http+limited", "Limiting is broken right now, check QTBUG-15065", Continue); QEXPECT_FAIL("https+limited", "Limiting is broken right now, check QTBUG-15065", Continue); - QVERIFY(server.transferRate <= maxRate); + QVERIFY(server.transferRate >= minRate && server.transferRate <= maxRate); } } |