diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 18:19:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 18:19:39 (GMT) |
| commit | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (patch) | |
| tree | 46fe034e7bac86f83fe97c586cfcf2ff51bcfbad /tests/auto | |
| parent | 45f372edda9d43bc98c7742a5dfdd89e4efbe225 (diff) | |
| parent | 433872d7e26a6a99297e231ac3bc0f603c9cefe8 (diff) | |
| download | Qt-b8327a0d5c5192750f7bf959290f6a50cdcb85b5.zip Qt-b8327a0d5c5192750f7bf959290f6a50cdcb85b5.tar.gz Qt-b8327a0d5c5192750f7bf959290f6a50cdcb85b5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QNetworkAccessFileBackend: Add warning for file url without scheme.
Native memory mapped file support
Fix compiler warning
Create QScopedResource class
Diffstat (limited to 'tests/auto')
| -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); |