diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:01:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:01:35 +0200 |
| commit | 5ce49470e6ae1da2e6fd51054e2030e5fe3072e4 (patch) | |
| tree | 73404278bd16e9a7dfb952ef3ca6ef4ed8a00462 /tests | |
| parent | 3c5bbb0dac7bed3199ddddc88c0175d5a2ac1036 (diff) | |
| parent | a0ee969c8d2f74382c0a8c9c77642d48a602577f (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5aedca14c2bd454de0c274eeca88d15b83ae07a5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 5274499a5..fbbd9c731 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -524,10 +524,8 @@ void tst_QAudioOutput::pull() QVERIFY2((audioOutput.elapsedUSecs() > 0), "elapsedUSecs() is still zero after start()"); // Wait until playback finishes - QTest::qWait(3000); // 3 seconds should be plenty - - QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QVERIFY2((stateSignal.count() == 1), + QTRY_VERIFY2(audioFile->atEnd(), "didn't play to EOF"); + QTRY_VERIFY2((stateSignal.count() == 1), QString("didn't emit IdleState signal when at EOF, got %1 signals instead").arg(stateSignal.count()).toLocal8Bit().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); |