diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-18 22:14:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 13:26:51 +0200 |
| commit | fb0978e96399c80b3520c120bd4d7e6fccb240b4 (patch) | |
| tree | 86522c142a411a915a79c40187ae68005de5a974 /tests | |
| parent | 77cc9125906783a92e86da020891b412e98b7159 (diff) | |
Remove insignification from QtConcurrentFilter test.
This test has one unstable failure that occurs about 0.8% of the time in
CI. Make the test catch this particular failure and re-enable the rest
of the test.
Task-number: QTBUG-20688
Change-Id: I22f5d372db77ea35163f96195ac0c174d8078899
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | 2 | ||||
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro index eb0c054f6f..e82d101de0 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro @@ -3,5 +3,3 @@ TARGET = tst_qtconcurrentfilter QT = core testlib concurrent SOURCES = tst_qtconcurrentfilter.cpp DEFINES += QT_STRICT_ITERATORS - -CONFIG += insignificant_test # See QTBUG-20688 diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index c8d4c211a9..57f05cbeae 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -1472,6 +1472,8 @@ void tst_QtConcurrentFilter::noDetach() QVERIFY(ll.isDetached() == false); QtConcurrent::filter(l, waitFilterfn).waitForFinished(); + if (!l.isDetached()) + QEXPECT_FAIL("", "QTBUG-20688: Known unstable failure", Abort); QVERIFY(l.isDetached() == true); QVERIFY(ll.isDetached() == true); } |