diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-02 14:46:15 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 07:36:51 +0200 |
commit | fb8d316e83c333acd20b912abf874fd240a8bedc (patch) | |
tree | b04264b620cb0a3126ff06a6813af3873b20bd53 | |
parent | 4e84be2876543c1bfcab3b854c92a7edade4144b (diff) |
test: replace CONFIG+=insignificant_test with QEXPECT_FAIL for tst_qftp
This autotest failure is entirely stable, so QEXPECT_FAIL should be used
instead of insignificant_test.
Task-number: QTBUG-20687
Change-Id: I0444e725b436fe93d30cbe54edc673594ca9b9fe
Reviewed-on: http://codereview.qt.nokia.com/2486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
-rw-r--r-- | tests/auto/qftp/qftp.pro | 2 | ||||
-rw-r--r-- | tests/auto/qftp/tst_qftp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro index 42c700e72e..69f89572ba 100644 --- a/tests/auto/qftp/qftp.pro +++ b/tests/auto/qftp/qftp.pro @@ -18,5 +18,3 @@ wince*: { } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -CONFIG+=insignificant_test diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index 62b454099b..e31b5acda3 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -378,6 +378,8 @@ void tst_QFtp::connectToUnresponsiveHost() a lot of other stuff in QFtp, so we just expect this test to fail on Windows. */ QEXPECT_FAIL("", "timeout not working due to strange Windows socket behaviour (see source file of this test for explanation)", Abort); +#else + QEXPECT_FAIL("", "QTBUG-20687", Abort); #endif QVERIFY2(! QTestEventLoop::instance().timeout(), "Network timeout longer than expected (should have been 60 seconds)"); |