diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:44:50 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:47:15 +0300 |
| commit | 0d3434fd0491d8d37dc0286b9d8ec8a454ba726b (patch) | |
| tree | 329557ed14a161827817765b0ccc6298fcf146b4 /tests | |
| parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
| parent | 62eeaba645d0f7c42246a0b026c532919a5b0454 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qaudiooutput/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/tests/auto/integration/qaudiooutput/BLACKLIST b/tests/auto/integration/qaudiooutput/BLACKLIST deleted file mode 100644 index e6cd7c846..000000000 --- a/tests/auto/integration/qaudiooutput/BLACKLIST +++ /dev/null @@ -1,8 +0,0 @@ -#QTBUG-52673 -[pullSuspendResume] -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -ubuntu-14.04 -opensuse-13.1 64bit -opensuse-42.1 -rhel-7.2 diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index fbbd9c731..ca1f2b67e 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -605,9 +605,6 @@ void tst_QAudioOutput::pullSuspendResume() audioOutput.resume(); - // Give backends running in separate threads a chance to suspend. - QTest::qWait(100); - // Check that QAudioOutput immediately transitions to ActiveState QVERIFY2((stateSignal.count() == 1), QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.count()).toLocal8Bit().constData()); @@ -619,8 +616,8 @@ void tst_QAudioOutput::pullSuspendResume() QTest::qWait(3000); // 3 seconds should be plenty QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit IdleState signal when at EOF, got %1 signals instead").arg(stateSignal.count()).toLocal8Bit().constData()); + QVERIFY(stateSignal.count() > 0); + QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); |