summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-20 11:48:26 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-20 11:48:26 (GMT)
commitb793f13f7787f63e496ab010252c92cf6f9d5567 (patch)
tree8f2e69446e63101413496e25ae672000198cb487 /tests
parent9db91e3d4a7f3bd92c7815b3257f459f3b3de01f (diff)
downloadQt-b793f13f7787f63e496ab010252c92cf6f9d5567.zip
Qt-b793f13f7787f63e496ab010252c92cf6f9d5567.tar.gz
Qt-b793f13f7787f63e496ab010252c92cf6f9d5567.tar.bz2
Some time related values have been changed to compensate for
Open C 1.5.3 pre-release having slow performance, at least as seen in the emulator.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index acc1d42..555ab34 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -424,11 +424,19 @@ public:
QTcpSocket *active = new QTcpSocket(this);
active->connectToHost("127.0.0.1", server.serverPort());
+#ifndef Q_OS_SYMBIAN
if (!active->waitForConnected(10))
return false;
if (!server.waitForNewConnection(10))
return false;
+#else
+ if (!active->waitForConnected(5000))
+ return false;
+
+ if (!server.waitForNewConnection(5000))
+ return false;
+#endif
QTcpSocket *passive = server.nextPendingConnection();
passive->setParent(this);
@@ -2327,8 +2335,13 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket()
}
QLocalSocket active;
active.connectToServer(socketname);
+#ifndef Q_OS_SYMBIAN
QVERIFY2(server.waitForNewConnection(10), server.errorString().toLatin1().constData());
QVERIFY2(active.waitForConnected(10), active.errorString().toLatin1().constData());
+#else
+ QVERIFY2(server.waitForNewConnection(5000), server.errorString().toLatin1().constData());
+ QVERIFY2(active.waitForConnected(5000), active.errorString().toLatin1().constData());
+#endif
QVERIFY2(server.hasPendingConnections(), server.errorString().toLatin1().constData());
QLocalSocket *passive = server.nextPendingConnection();
@@ -2343,7 +2356,11 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket()
passive->setParent(reply);
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+#ifndef Q_OS_SYMBIAN
QTestEventLoop::instance().enterLoop(10);
+#else
+ QTestEventLoop::instance().enterLoop(30);
+#endif
QVERIFY(!QTestEventLoop::instance().timeout());
QCOMPARE(reply->url(), url);
@@ -2652,7 +2669,11 @@ void tst_QNetworkReply::downloadProgress_data()
QTest::newRow("empty") << 0;
QTest::newRow("small") << 4;
+#ifndef Q_OS_SYMBIAN
QTest::newRow("big") << 4096;
+#else
+ QTest::newRow("big") << 1024;
+#endif
}
void tst_QNetworkReply::downloadProgress()