summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@qt.io>2016-09-22 08:45:35 +0300
committerYoann Lopes <yoann.lopes@qt.io>2016-09-22 08:45:35 +0300
commit7de936f6b3c428095d71db940ef08e532133b084 (patch)
tree73c2368b9d62d84812d6c65426b9100f14e704e7 /tests
parent256ee311b936d69561e97f7f8ee832cff93cb509 (diff)
parent7d00a457e455e159a3dde30ad798be744cf38bb1 (diff)
downloadqtmultimedia-7de936f6b3c428095d71db940ef08e532133b084.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/qaudiooutput/BLACKLIST8
-rw-r--r--tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp7
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();