summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-01-25 13:18:23 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-01-25 13:28:24 (GMT)
commit00553adc2ab5c38f1870b036d4bec881acb77511 (patch)
tree0fed514f001d74146d646b254304d1a767116319
parent5f41f2b4bbe3f4d3f7e2ccb6c14273c5a308b837 (diff)
downloadQt-00553adc2ab5c38f1870b036d4bec881acb77511.zip
Qt-00553adc2ab5c38f1870b036d4bec881acb77511.tar.gz
Qt-00553adc2ab5c38f1870b036d4bec881acb77511.tar.bz2
Fix some qnetworkreply test cases for symbian
The unreachable IP test needs a longer timeout than on desktops. The manual construction of a file:// URL was incorrect in the case where SRCDIR is "." - this is changed to the recommended QUrl::fromLocalFile API. Reviewed-by: Markus Goetz
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 3e07176..71a8352 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -5302,7 +5302,7 @@ void tst_QNetworkReply::getFromUnreachableIp()
QNetworkReplyPtr reply = manager.get(request);
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
- QTestEventLoop::instance().enterLoop(5);
+ QTestEventLoop::instance().enterLoop(10);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(reply->error() != QNetworkReply::NoError);
@@ -5469,7 +5469,7 @@ void tst_QNetworkReply::synchronousRequest_data()
<< QString("text/plain");
QTest::newRow("simple-file")
- << QUrl(QString::fromLatin1("file:///" SRCDIR "/rfc3252.txt"))
+ << QUrl::fromLocalFile(SRCDIR "/rfc3252.txt")
<< QString("file:" SRCDIR "/rfc3252.txt")
<< true
<< QString();