diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-19 13:25:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-19 13:39:16 +0200 |
commit | 66c0334a3c4cb8deb63c67aa70da3f4ed94f89a4 (patch) | |
tree | caf62f9e6a8486862216306f62bf1ff4627df9f7 /tests | |
parent | acc49e582abf76c962851f53cbd66134812f6a1f (diff) | |
parent | 6b5b4d4ab4806812eaa4f6ddc78831ad31d0e7d9 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
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() |