summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-30 14:38:38 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-30 15:12:00 (GMT)
commit705a4811e3bdfddc4dbfe1499fe311c1fa3c5b38 (patch)
tree1022be2d049d5bb0e20a12c312424847edc184f6
parent5d9f735289a787fd9ef4d7921374382424f880d7 (diff)
downloadQt-705a4811e3bdfddc4dbfe1499fe311c1fa3c5b38.zip
Qt-705a4811e3bdfddc4dbfe1499fe311c1fa3c5b38.tar.gz
Qt-705a4811e3bdfddc4dbfe1499fe311c1fa3c5b38.tar.bz2
Autotest: reduce the amout of data transferred to 128 MB, otherwise the
test wouldn't finish. Running under valgrind and slow operating systems, the transfer rate is only a couple of MB per second. As long as you can reach 3.2 MB/s now, it should still work Also, don't kill the thread, for any reason. That causes trouble. Reviewed-by: Markus Goetz
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 4ebc316..cfd3dd0 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -3267,7 +3267,7 @@ void tst_QNetworkReply::uploadPerformance()
void tst_QNetworkReply::httpUploadPerformance()
{
- enum {UploadSize = 1000*1024*1024}; // 1000 MB
+ enum {UploadSize = 128*1024*1024}; // 128 MB
ThreadedDataReaderHttpServer reader;
FixedSizeDataGenerator generator(UploadSize);
@@ -3289,7 +3289,7 @@ void tst_QNetworkReply::httpUploadPerformance()
<< ((UploadSize/1024.0)/(elapsed/1000.0)) << " kB/sec";
reader.exit();
- reader.wait(3000);
+ reader.wait();
}
@@ -3333,7 +3333,7 @@ void tst_QNetworkReply::httpDownloadPerformance()
QFETCH(bool, serverSendsContentLength);
QFETCH(bool, chunkedEncoding);
- enum {UploadSize = 1000*1024*1024}; // 1000 MB
+ enum {UploadSize = 128*1024*1024}; // 128 MB
HttpDownloadPerformanceServer server(UploadSize, serverSendsContentLength, chunkedEncoding);
QNetworkRequest request(QUrl("http://127.0.0.1:" + QString::number(server.serverPort()) + "/?bare=1"));