From fb0978e96399c80b3520c120bd4d7e6fccb240b4 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 18 Apr 2012 22:14:04 +1000 Subject: 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 --- tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | 2 -- tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/concurrent') 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); } -- cgit v1.2.3