From 01413cf1e63c735ef9d53d1e3979bf97fd2bc4d1 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 8 Sep 2017 11:56:04 +0300 Subject: Skip OVG tests on boot2qt Loading OVG is unstable on qemu. That needs to be skipped for boot2qt tests. This will conflict when merging to branch 5.10 with commit c341b2b25697f937280fe3620629ac3d32c19613. Correct version is in 5.10. Task-number: QTBUG-63079 Change-Id: Ic691beb3dbbfdc64ca31b380ad85d9dadbe08a90 Reviewed-by: Simon Hausmann --- tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro | 5 +++++ .../auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 2 ++ 2 files changed, 7 insertions(+) (limited to 'tests') diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro index 87637fadc..919fae91d 100644 --- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro +++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro @@ -10,3 +10,8 @@ SOURCES += \ tst_qmediaplayerbackend.cpp TESTDATA += testdata/* + +boot2qt: { + # OGV testing is unstable with qemu + QMAKE_CXXFLAGS += -DSKIP_OGV_TEST +} diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index fb72a239c..5a703f2e1 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -221,7 +221,9 @@ void tst_QMediaPlayerBackend::initTestCase() QStringList mediaCandidates; mediaCandidates << QFINDTESTDATA("testdata/colors.mp4"); +#ifndef SKIP_OGV_TEST mediaCandidates << QFINDTESTDATA("testdata/colors.ogv"); +#endif localVideoFile = selectMediaFile(mediaCandidates); mediaCandidates.clear(); -- cgit v1.2.1 From d41bce99a531a7968f8c5bc8ec88965372341bd9 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 8 Sep 2017 14:57:59 +0300 Subject: Blacklist tst_QSound::testLooping for OpenSuse 42.3 Task-number: QTBUG-63090 Change-Id: I5e9288d0d7d31972b7ba5745819d0b6a962d3191 Reviewed-by: Simon Hausmann --- tests/auto/integration/qsound/BLACKLIST | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/auto/integration/qsound/BLACKLIST (limited to 'tests') 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 + -- cgit v1.2.1 From 51b361faa703e157feaa0cfd79e7d473cb704811 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Tue, 26 Sep 2017 11:36:39 +0200 Subject: Adjust timeouts for QSounds auto tests These tests contains fixed timeouts which sometimes is not enough, causing the test to fail under heavy load. Since isFinished() doesn't actually tell if a device has started, the timeout might come too early, e.g., when the device is still waiting for data, or even before it has started. Change-Id: I8f2f8341b9fcf656d86d161203c7eb63e66acca5 Reviewed-by: Christian Stromme --- tests/auto/integration/qsound/tst_qsound.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tests') 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() -- cgit v1.2.1