diff options
author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-05-09 14:01:22 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 04:24:38 +0200 |
commit | 3e697188dab7e14e4e1e2796f89962bf6ccab76d (patch) | |
tree | 07b0be18a03f3aca8606dd9cd003a30cd42e1f0c /tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | |
parent | 384c155627c17526621e9f14aa1507fc75540adc (diff) |
tst_QNetworkReply: enable the ioGetFromBuiltinHttp test.
This can be enabled again now. The sender transfer test is still not
re-enabled since the test would take to long to run if sending
enough data to overwhelm the reciever's kernel buffers.
Change-Id: I4056fdca53ec8ebbcc53dfdc814d8bfdbc73f7ce
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Diffstat (limited to 'tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp')
-rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 95cf2c9936..e3386406fc 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -4452,7 +4452,6 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data() void tst_QNetworkReply::ioGetFromBuiltinHttp() { - QSKIP("Limiting is broken right now, check QTBUG-15065"); QFETCH(bool, https); QFETCH(int, bufferSize); @@ -4509,8 +4508,6 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp() if (reader.data.size() < testData.size()) { // oops? QCOMPARE(reader.data, testData.mid(0, reader.data.size())); qDebug() << "The data is incomplete, the last" << testData.size() - reader.data.size() << "bytes are missing"; - QEXPECT_FAIL("http+limited", "Limiting is broken right now, check QTBUG-15065", Abort); - QEXPECT_FAIL("https+limited", "Limiting is broken right now, check QTBUG-15065", Abort); } QCOMPARE(reader.data.size(), testData.size()); QCOMPARE(reader.data, testData); @@ -4522,9 +4519,11 @@ 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 << "?"; - 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 >= minRate && server.transferRate <= maxRate); + // The test takes too long to run if sending enough data to overwhelm the + // reciever's kernel buffers. + //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 >= minRate && server.transferRate <= maxRate); } } |