test: improved stability of tst_qwaitcondition

Increased thread wait timeout from 3 to 10 milliseconds, for slower or
heavily loaded machines.  (There was a previous attempt to improve
stability of this test some time ago by increasing the timeout from 1
to 3 milliseconds.)

Note that this increases the runtime of the wakeOne test from ~5 to ~14
seconds.

Change-Id: Ib556d4c949a6989fe71c11f5dc10feb2ec45c512
Reviewed-on: http://codereview.qt.nokia.com/2458
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
This commit is contained in:
Rohan McGovern 2011-08-02 10:22:08 +10:00 committed by Qt by Nokia
parent 7e57389a5b
commit 6e745ecda7

View File

@ -491,7 +491,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
if (thread[y].wait(exited > 0 ? 3 : 1000)) {
if (thread[y].wait(exited > 0 ? 10 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@ -535,7 +535,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
if (rwthread[y].wait(exited > 0 ? 3 : 1000)) {
if (rwthread[y].wait(exited > 0 ? 10 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@ -587,7 +587,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
if (thread[y].wait(exited > 0 ? 3 : 1000)) {
if (thread[y].wait(exited > 0 ? 10 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}
@ -633,7 +633,7 @@ void tst_QWaitCondition::wakeOne()
for (int y = 0; y < ThreadCount; ++y) {
if (thread_exited[y])
continue;
if (rwthread[y].wait(exited > 0 ? 3 : 1000)) {
if (rwthread[y].wait(exited > 0 ? 10 : 1000)) {
thread_exited[y] = TRUE;
++exited;
}