diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2020-11-30 00:30:43 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2020-11-30 18:22:59 +0100 |
| commit | 7e2c2ebbbfa3362f97ba09a002bbb6a672f524af (patch) | |
| tree | e3d555117e490415549bf032085006f9e6fe9c58 /tests/auto/quick | |
| parent | 1e1674849a89db54cdbcc4e995300e3ec1624c3a (diff) | |
Relax the timings on the new testTransitionWithImplicitFrom test
Change-Id: Ie9fae8a7edb07c6df499a06fdc9d539e114b789e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquickanimators/tst_qquickanimators.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp index b13f3bd343..34aace57a0 100644 --- a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp +++ b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp @@ -153,29 +153,29 @@ void tst_Animators::testTransitionsWithImplicitFrom() // transition to the "right" state rectangle->setState("right"); - QTRY_VERIFY_WITH_TIMEOUT(!controller->m_runningAnimators.isEmpty(), 1000); + QTRY_VERIFY(!controller->m_runningAnimators.isEmpty()); auto r_job = *controller->m_runningAnimators.constBegin(); QVERIFY(r_job); QCOMPARE(r_job->from(), 0); QCOMPARE(r_job->to(), 100); - QTRY_VERIFY_WITH_TIMEOUT(controller->m_runningAnimators.isEmpty(), 1000); + QTRY_VERIFY(controller->m_runningAnimators.isEmpty()); // verify state after first transition - QTRY_COMPARE_WITH_TIMEOUT(rectangle->x(), 100, 1000); // the render thread has to sync first + QTRY_COMPARE(rectangle->x(), 100); // the render thread has to sync first QCOMPARE(rectangle->state(), "right"); QVERIFY(controller->m_runningAnimators.isEmpty()); // transition back to the "left" state rectangle->setState("left"); - QTRY_VERIFY_WITH_TIMEOUT(!controller->m_runningAnimators.isEmpty(), 1000); + QTRY_VERIFY(!controller->m_runningAnimators.isEmpty()); auto l_job = *controller->m_runningAnimators.constBegin(); QVERIFY(l_job); QCOMPARE(l_job->from(), 100); // this was not working in older Qt versions QCOMPARE(l_job->to(), 0); - QTRY_VERIFY_WITH_TIMEOUT(controller->m_runningAnimators.isEmpty(), 1000); + QTRY_VERIFY(controller->m_runningAnimators.isEmpty()); // verify the final state - QTRY_COMPARE_WITH_TIMEOUT(rectangle->x(), 0, 1000); // the render thread has to sync first + QTRY_COMPARE(rectangle->x(), 0); // the render thread has to sync first QCOMPARE(rectangle->state(), "left"); QVERIFY(controller->m_runningAnimators.isEmpty()); } |