diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-12-14 14:40:15 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-12-21 08:53:00 +0000 |
| commit | 6606b151c4c4849ab0b0e6b8d62837ac87858814 (patch) | |
| tree | 125507008bd56df7de0bc370eaf1e74be9f2ae52 /tests | |
| parent | 4e012cb08390beb21620b5d3fbf86ad2216b2a6d (diff) | |
Get rid of qWait in tst_qtimeline::restart to make it less flaky
Change-Id: Iba3a9e5dce6bd7ff6e241fae738cfc51386f0c75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp index 98e8ffded5..9f8cfc6b6a 100644 --- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp +++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp @@ -621,8 +621,7 @@ void tst_QTimeLine::restart() timeLine.setFrameRange(0,9); timeLine.start(); - QTest::qWait(timeLine.duration()*2); - QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QTRY_COMPARE(timeLine.currentFrame(), timeLine.endFrame()); QCOMPARE(timeLine.state(), QTimeLine::NotRunning); // A restart with the same duration @@ -630,8 +629,7 @@ void tst_QTimeLine::restart() QCOMPARE(timeLine.state(), QTimeLine::Running); QCOMPARE(timeLine.currentFrame(), timeLine.startFrame()); QCOMPARE(timeLine.currentTime(), 0); - QTest::qWait(250); - QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QTRY_COMPARE(timeLine.currentFrame(), timeLine.endFrame()); QCOMPARE(timeLine.state(), QTimeLine::NotRunning); // Set a smaller duration and restart @@ -640,8 +638,7 @@ void tst_QTimeLine::restart() QCOMPARE(timeLine.state(), QTimeLine::Running); QCOMPARE(timeLine.currentFrame(), timeLine.startFrame()); QCOMPARE(timeLine.currentTime(), 0); - QTest::qWait(250); - QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QTRY_COMPARE(timeLine.currentFrame(), timeLine.endFrame()); QCOMPARE(timeLine.state(), QTimeLine::NotRunning); // Set a longer duration and restart |