From 72ea9e1e9484a442e40d936403d3cf85c000fd81 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 6 Sep 2012 12:47:50 +0200 Subject: Test: Replace QSKIP by XFAIL For tst_QtConcurrentThreadEngine::threadCount Change-Id: I14b904a26900a01d5d04245ad60d9752f5645e68 Reviewed-by: Sergio Ahumada --- .../tst_qtconcurrentthreadengine.cpp | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'tests/auto/concurrent') diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp index 9722887c7d..f120fc22be 100644 --- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp +++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp @@ -278,26 +278,40 @@ public: void tst_QtConcurrentThreadEngine::threadCount() { - QSKIP("QTBUG-23333: This test is unstable"); + //QTBUG-23333: This test is unstable const int repeats = 10; for (int i = 0; i < repeats; ++i) { ThreadCountUser t; t.startBlocking(); - QCOMPARE(threads.count(), QThreadPool::globalInstance()->maxThreadCount() + 1); // +1 for the main thread. + int count = threads.count(); + int count_expected = QThreadPool::globalInstance()->maxThreadCount() + 1; // +1 for the main thread. + if (count != count_expected) + QEXPECT_FAIL("", "QTBUG-23333", Abort); + QCOMPARE(count, count_expected); (new ThreadCountUser())->startAsynchronously().waitForFinished(); - QCOMPARE(threads.count(), QThreadPool::globalInstance()->maxThreadCount()); + count = threads.count(); + count_expected = QThreadPool::globalInstance()->maxThreadCount(); + if (count != count_expected) + QEXPECT_FAIL("", "QTBUG-23333", Abort); + QCOMPARE(count, count_expected); } // Set the finish flag immediately, this should give us one thread only. for (int i = 0; i < repeats; ++i) { ThreadCountUser t(true /*finishImmediately*/); t.startBlocking(); - QCOMPARE(threads.count(), 1); + int count = threads.count(); + if (count != 1) + QEXPECT_FAIL("", "QTBUG-23333", Abort); + QCOMPARE(count, 1); (new ThreadCountUser(true /*finishImmediately*/))->startAsynchronously().waitForFinished(); - QCOMPARE(threads.count(), 1); + count = threads.count(); + if (count != 1) + QEXPECT_FAIL("", "QTBUG-23333", Abort); + QCOMPARE(count, 1); } } -- cgit v1.2.3