test: improved stability of tst_qwaitcondition
authorRohan McGovern <rohan.mcgovern@nokia.com>
Tue, 2 Aug 2011 00:22:08 +0000 (10:22 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 2 Aug 2011 05:37:03 +0000 (07:37 +0200)
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>
tests/auto/qwaitcondition/tst_qwaitcondition.cpp

index c677d17..6545df9 100644 (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;
             }