summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 15:08:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 15:08:11 (GMT)
commit43e9b68620e9de2cd6ec15cfd69b2327e8232fe2 (patch)
tree7ea3fc42058deeb890d32cc864fd2b3f9936d7b6 /tests/auto
parent9ecd481a859977660b68a57d3b2203f75377ccc4 (diff)
parent0a93295aba1f5e80a03b095df68f22d0a805922f (diff)
downloadQt-43e9b68620e9de2cd6ec15cfd69b2327e8232fe2.zip
Qt-43e9b68620e9de2cd6ec15cfd69b2327e8232fe2.tar.gz
Qt-43e9b68620e9de2cd6ec15cfd69b2327e8232fe2.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Pipelining changes
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 35ebbd9..0b55390 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -801,7 +801,7 @@ void tst_QHttpNetworkConnection::getMultiple_data()
QTest::newRow("6 connections, no pipelining, 100 requests") << quint16(6) << false << 100;
QTest::newRow("1 connection, no pipelining, 100 requests") << quint16(1) << false << 100;
- QTest::newRow("6 connections, pipelining allowed, 100 requests") << quint16(2) << true << 100;
+ QTest::newRow("6 connections, pipelining allowed, 100 requests") << quint16(6) << true << 100;
QTest::newRow("1 connection, pipelining allowed, 100 requests") << quint16(1) << true << 100;
}