slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make qmediaplayerbackend::seekPauseSeek test less flaky.

Browse Source 
Change-Id: I05e4b9d392359bd84f9e932864a2e14275ef625f
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-10-31 21:51:36 +01:00
parent 82e135167a
commit 2593f00411
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
View File

@@ -720,7 +720,7 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
player.pause(); player.pause();
QTRY_COMPARE(player.state(), QMediaPlayer::PausedState); // it might take some time for the operation to be completed QTRY_COMPARE(player.state(), QMediaPlayer::PausedState); // it might take some time for the operation to be completed
QTRY_COMPARE(surface->m_frameList.size(), 1); // we must see a frame at position 7000 here QTRY_VERIFY(!surface->m_frameList.isEmpty()); // we must see a frame at position 7000 here
{ {
QVideoFrame frame = surface->m_frameList.back(); QVideoFrame frame = surface->m_frameList.back();
@@ -739,12 +739,13 @@ void tst_QMediaPlayerBackend::seekPauseSeek()
frame.unmap(); frame.unmap();
} }
surface->m_frameList.clear();
positionSpy.clear(); positionSpy.clear();
position = 12000; position = 12000;
player.setPosition(position); player.setPosition(position);
QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500); QTRY_VERIFY(!positionSpy.isEmpty() && qAbs(player.position() - position) < (qint64)500);
QCOMPARE(player.state(), QMediaPlayer::PausedState); QCOMPARE(player.state(), QMediaPlayer::PausedState);
QCOMPARE(surface->m_frameList.size(), 2); QVERIFY(!surface->m_frameList.isEmpty());
{ {
QVideoFrame frame = surface->m_frameList.back(); QVideoFrame frame = surface->m_frameList.back();