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>
This commit is contained in:
Jason McDonald 2011-12-28 16:52:24 +10:00 committed by Qt by Nokia
parent 7dffcf8a74
commit b4557829f4

View File

@ -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;