Try to stabilize flaky test cases of tst_qsequentialanimationgroup
Use QTRY_COMPARE in the flaky tests instead of waiting. Change-Id: Ic18fc5fde3fa47f3b3ef21e6acd876bd6990981d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
parent
a719c630f1
commit
0ae6803d39
@ -1295,10 +1295,9 @@ void tst_QSequentialAnimationGroup::startGroupWithRunningChild()
|
|||||||
QCOMPARE(anim1->state(), QAnimationGroup::Running);
|
QCOMPARE(anim1->state(), QAnimationGroup::Running);
|
||||||
QCOMPARE(anim2->state(), QAnimationGroup::Paused);
|
QCOMPARE(anim2->state(), QAnimationGroup::Paused);
|
||||||
|
|
||||||
QTest::qWait(300);
|
// Wait until anim1 finishes (anim2 should be still running)
|
||||||
|
QTRY_COMPARE(anim1->state(), QAnimationGroup::Stopped);
|
||||||
QCOMPARE(group.state(), QAnimationGroup::Running);
|
QCOMPARE(group.state(), QAnimationGroup::Running);
|
||||||
QCOMPARE(anim1->state(), QAnimationGroup::Stopped);
|
|
||||||
QCOMPARE(anim2->state(), QAnimationGroup::Running);
|
QCOMPARE(anim2->state(), QAnimationGroup::Running);
|
||||||
|
|
||||||
QCOMPARE(stateChangedSpy2.count(), 4);
|
QCOMPARE(stateChangedSpy2.count(), 4);
|
||||||
@ -1615,7 +1614,7 @@ void tst_QSequentialAnimationGroup::clear()
|
|||||||
group.start();
|
group.start();
|
||||||
QTest::qWait(anim1->duration() + 100);
|
QTest::qWait(anim1->duration() + 100);
|
||||||
QTRY_COMPARE(group.state(), QAbstractAnimation::Running);
|
QTRY_COMPARE(group.state(), QAbstractAnimation::Running);
|
||||||
QVERIFY(anim1 == 0); //anim1 should have been deleted
|
QTRY_COMPARE(anim1, nullptr); // anim1 should have been deleted
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QSequentialAnimationGroup::pauseResume()
|
void tst_QSequentialAnimationGroup::pauseResume()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user