diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
| commit | 339944b284e9dd11302dd013f9d9a10ad0d9055a (patch) | |
| tree | c2952d186b1dbc6f2380448fa2cfd9ec55043da6 /tests/auto/integration | |
| parent | 53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff) | |
| parent | d7d31d63db5f0029a4a5e24d998601baee8bade0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qsoundeffect/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST deleted file mode 100644 index 3a358789a..000000000 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ /dev/null @@ -1,8 +0,0 @@ -# QTBUG-46689 - -[testLooping] -ubuntu-14.04 64bit -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -opensuse-13.1 -rhel-7.2 diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index dd486a1a3..5be889096 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -183,7 +183,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()); } @@ -198,7 +198,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); @@ -214,7 +214,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()); } } |