Small fixes to tst_qcamerabackend/tst_qmediaplayerbackend

Change-Id: Ia5480d4bd51783deaeb3e90646acd4c8af30515c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 619f975f7529a0c2503377615917b1a858e4f2a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index a8fab90b1..27e0687a4 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -574,7 +574,7 @@ void tst_QCameraBackend::testVideoRecording()
         //record 200ms clip
         recorder.record();
         durationChanged.clear();
-        QVERIFY(durationChanged.wait(1000));
+        QTRY_VERIFY(durationChanged.count());
 
         QCOMPARE(recorder.metaData(), metaData);
 
@@ -628,7 +628,7 @@ void tst_QCameraBackend::testNativeMetadata()
 
     recorder.record();
     durationChanged.clear();
-    QVERIFY(durationChanged.wait(1000));
+    QTRY_VERIFY(durationChanged.count());
 
     QCOMPARE(recorder.metaData(), metaData);
 
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 102b31c3a..36983b308 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -1149,6 +1149,9 @@ void tst_QMediaPlayerBackend::positionAfterSeek()
 
 void tst_QMediaPlayerBackend::videoDimensions()
 {
+    if (localVideoFile.isEmpty())
+        QSKIP("No supported video file");
+
     TestVideoSink surface(true);
     QMediaPlayer player;
     player.setVideoOutput(&surface);