From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 28 Dec 2011 06:52:24 +0000 (+1000)
Subject: Don't allow QThreadPool test to hang on failure.
X-Git-Tag: qt-v5.0.0-alpha1~2111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4557829f47fd293fcf7fc73d705a7b11e3fb49b;p=profile%2Fivi%2Fqtbase.git

Don't allow QThreadPool test to hang on failure.

Use QTRY_VERIFY() to fail after a reasonable timeout rather than putting
the test into an infinite loop.

Change-Id: Ie0917556e15999a94cc0587f3f4c11c0d743a228
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---

diff --git a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
index ff26d5d..ab67160 100644
--- a/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/concurrent/qthreadpool/tst_qthreadpool.cpp
@@ -205,9 +205,7 @@ void tst_QThreadPool::runTask()
     QThreadPool manager;
     ran = false;
     manager.start(new TestTask());
-    // Hang if task is not runned.
-    while (ran == false)
-        QTest::qSleep(100); // no busy loop - this doesn't work with FIFO schedulers
+    QTRY_VERIFY(ran);
 }
 
 /*
@@ -217,8 +215,7 @@ void tst_QThreadPool::singleton()
 {
     ran = false;
     QThreadPool::globalInstance()->start(new TestTask());
-    while (ran == false)
-        QTest::qSleep(100); // no busy loop - this doesn't work with FIFO schedulers
+    QTRY_VERIFY(ran);
 }
 
 int *value = 0;