diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-20 11:00:50 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-20 11:00:50 (GMT) |
| commit | 433872d7e26a6a99297e231ac3bc0f603c9cefe8 (patch) | |
| tree | 06ddc09478d5b0716121043ccde471136ff0eb60 /tests/auto/qnetworkreply | |
| parent | b66db48934bc13cc7439e0fc9c8ec54122678a02 (diff) | |
| parent | 4082ed92ed80c57cb499de569631a664107ef05b (diff) | |
| download | Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.zip Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.tar.gz Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.tar.bz2 | |
Merge remote-tracking branch 'earth-team/master'
Diffstat (limited to 'tests/auto/qnetworkreply')
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index f56176a..70287a9 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -1672,10 +1672,8 @@ 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 && QFileInfo(url).isAbsolute()) 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 @@ -1691,10 +1689,9 @@ void tst_QNetworkReply::getErrors() //qDebug() << reply->errorString(); QFETCH(int, error); -#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN) if (QFileInfo(url).isAbsolute()) - QEXPECT_FAIL("empty-scheme-host", "this is expected to fail on Windows and Symbian, QTBUG-17731", Abort); -#endif + QEXPECT_FAIL("empty-scheme-host", "this is expected to fail, QTBUG-17731", Abort); + QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort); // the line below is not necessary QEXPECT_FAIL("ftp-dir-not-readable", "QFtp cannot provide enough detail", Abort); |