Added QThreadPool::waitForDone(int msecs)

Merge-request: 641
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: Morten Sorvig
Task-number: QTBUG-2695

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/qthreadpool/tst_qthreadpool.cpp b/tests/auto/qthreadpool/tst_qthreadpool.cpp
index 7c8b410..cd6070f 100644
--- a/tests/auto/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/qthreadpool/tst_qthreadpool.cpp
@@ -89,6 +89,7 @@ private slots:
     void tryStartPeakThreadCount();
     void tryStartCount();
     void waitForDone();
+    void waitForDoneTimeout();
     void destroyingWaitsForTasksToFinish();
     void stressTest();
 };
@@ -774,6 +775,32 @@ void tst_QThreadPool::waitForDone()
     }
 }
 
+void tst_QThreadPool::waitForDoneTimeout()
+{
+    class BlockedTask : public QRunnable
+    {
+    public:
+      QMutex mutex;
+      BlockedTask() { setAutoDelete(false); }
+      
+      void run()
+        {
+          mutex.lock();
+          mutex.unlock();
+          QTest::qSleep(50);
+        }
+    };
+
+    QThreadPool threadPool;
+
+    BlockedTask *task = new BlockedTask;
+    task->mutex.lock();
+    threadPool.start(task);
+    QVERIFY(!threadPool.waitForDone(100));
+    task->mutex.unlock();
+    QVERIFY(threadPool.waitForDone(400));
+}
+
 void tst_QThreadPool::destroyingWaitsForTasksToFinish()
 {
     QTime total, pass;