diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
| commit | 2972eaa1330f377a7c3b1f583a643dbfbfc9531e (patch) | |
| tree | b3407be7bba8c50df76a550c5c2867061c6dea95 /tests | |
| parent | 230f070c7ed353605260f9fa79d0a5bc5181321c (diff) | |
| parent | 51b361faa703e157feaa0cfd79e7d473cb704811 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qsound/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/integration/qsound/tst_qsound.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/integration/qsound/BLACKLIST b/tests/auto/integration/qsound/BLACKLIST new file mode 100644 index 000000000..ccb68f541 --- /dev/null +++ b/tests/auto/integration/qsound/BLACKLIST @@ -0,0 +1,3 @@ +[testLooping] +opensuse-42.3 + diff --git a/tests/auto/integration/qsound/tst_qsound.cpp b/tests/auto/integration/qsound/tst_qsound.cpp index 729b0f086..9fcf79184 100644 --- a/tests/auto/integration/qsound/tst_qsound.cpp +++ b/tests/auto/integration/qsound/tst_qsound.cpp @@ -88,9 +88,7 @@ void tst_QSound::testLooping() QVERIFY(!sound->isFinished()); // test.wav is about 200ms, wait until it has finished playing 5 times - QTest::qWait(3000); - - QVERIFY(sound->isFinished()); + QTRY_VERIFY(sound->isFinished()); QCOMPARE(sound->loopsRemaining(),0); } @@ -99,8 +97,7 @@ void tst_QSound::testPlay() sound->setLoops(1); sound->play(); QVERIFY(!sound->isFinished()); - QTest::qWait(1000); - QVERIFY(sound->isFinished()); + QTRY_VERIFY(sound->isFinished()); } void tst_QSound::testStop() @@ -110,8 +107,7 @@ void tst_QSound::testStop() QVERIFY(!sound->isFinished()); QTest::qWait(1000); sound->stop(); - QTest::qWait(1000); - QVERIFY(sound->isFinished()); + QTRY_VERIFY(sound->isFinished()); } void tst_QSound::testStaticPlay() |