From efccadf055dee97dae0a985c0680ff55acc5fbd7 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 29 Jun 2016 08:52:29 +0300 Subject: tst_qsoundeffect: Update to case testLooping Be more permissive while checking loops remaining. Remove file BLACKLIST Task-number: QTBUG-46689 Change-Id: I15b5fb55ee770a190b2c21dd8cf1fad45665a73c Reviewed-by: Milla Pohjanheimo Reviewed-by: Yoann Lopes --- tests/auto/integration/qsoundeffect/BLACKLIST | 7 ------- tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 tests/auto/integration/qsoundeffect/BLACKLIST (limited to 'tests/auto') diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST deleted file mode 100644 index 1feeb4b5f..000000000 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ /dev/null @@ -1,7 +0,0 @@ -# QTBUG-46689 - -[testLooping] -ubuntu-14.04 64bit -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -opensuse-13.1 diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index 604607ab0..035ce3e13 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -188,7 +188,7 @@ void tst_QSoundEffect::testLooping() // wait for all the loops to be completed QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 6); + QTRY_VERIFY(readSignal_Remaining.count() >= 6); QTRY_VERIFY(!sound->isPlaying()); } @@ -203,7 +203,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 0); sound->play(); - QCOMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); + QTRY_COMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); QCOMPARE(readSignal_Remaining.count(), 1); QTest::qWait(1500); @@ -219,7 +219,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 1); QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 2); + QTRY_VERIFY(readSignal_Remaining.count() >= 2); QTRY_VERIFY(!sound->isPlaying()); } } -- cgit v1.2.3