diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 17:42:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 17:42:25 (GMT) |
| commit | 463cd4f6563dc12d8b45bf2e293dc64d583e132c (patch) | |
| tree | 1d1a6123f42fe8843f32c572cd3d1c4fb42aefcd /tests/auto/qsharedmemory/tst_qsharedmemory.cpp | |
| parent | 4879551f72a377e0816164ce1762eb646839f4a6 (diff) | |
| parent | 0295f8da10d6c920511d09f9e506b8bed8c444c3 (diff) | |
| download | Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.zip Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.tar.gz Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'tests/auto/qsharedmemory/tst_qsharedmemory.cpp')
| -rw-r--r-- | tests/auto/qsharedmemory/tst_qsharedmemory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp index f72b6f7..4148594 100644 --- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp +++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp @@ -756,12 +756,12 @@ void tst_QSharedMemory::simpleProcessProducerConsumer() ++failedProcesses; } - producer.waitForFinished(5000); + QVERIFY(producer.waitForFinished(5000)); bool consumerFailed = false; while (!consumers.isEmpty()) { - consumers.first()->waitForFinished(2000); + QVERIFY(consumers.first()->waitForFinished(3000)); if (consumers.first()->state() == QProcess::Running || consumers.first()->exitStatus() != QProcess::NormalExit || consumers.first()->exitCode() != 0) { |