summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Petersson <martin.petersson@nokia.com>2011-02-24 12:50:54 (GMT)
committerMartin Petersson <martin.petersson@nokia.com>2011-02-24 12:53:58 (GMT)
commit9b96f2719a8a3a52e1b93f305b2a18fa9ddf5b28 (patch)
tree19f2f1cc3e9e7582251a5a9b40d5fa74d78d1472
parentbc320e1f1e0157d53d153b2392a36905e012b683 (diff)
downloadQt-9b96f2719a8a3a52e1b93f305b2a18fa9ddf5b28.zip
Qt-9b96f2719a8a3a52e1b93f305b2a18fa9ddf5b28.tar.gz
Qt-9b96f2719a8a3a52e1b93f305b2a18fa9ddf5b28.tar.bz2
tst_qnetworkreply: getErrors() only ignore warning for the specific test
Reviewed-by: Markus Goetz
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 50e3b48..6f889c6 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1498,6 +1498,12 @@ void tst_QNetworkReply::getErrors()
{
QFETCH(QString, url);
QNetworkRequest request(url);
+
+#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
+ if (qstrcmp(QTest::currentDataTag(), "empty-scheme-host") == 0)
+ QTest::ignoreMessage(QtWarningMsg, "QNetworkAccessFileBackendFactory: URL has no schema set, use file:// for files");
+#endif
+
QNetworkReplyPtr reply = manager.get(request);
reply->setParent(this); // we have expect-fails
@@ -1513,7 +1519,6 @@ void tst_QNetworkReply::getErrors()
QFETCH(int, error);
#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
- QTest::ignoreMessage(QtWarningMsg, "QNetworkAccessFileBackendFactory: URL has no schema set, use file:// for files");
QEXPECT_FAIL("empty-scheme-host", "this is expected to fail on Windows and Symbian, QTBUG-17731", Abort);
#endif
QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort);