qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stabilize tst_qpauseanimationjob.cpp some more 

Apply the same exceptions for macOS that are used for windows in select
places, and increase the timeout in changeDirectionWhileRunning().

Fixes: QTBUG-81938
Change-Id: Idae5ae8d125f106dcb74b75be2df0c417363e7cc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2022-01-18 14:26:38 +01:00
parent de30f10aeb
commit 1fd5f00d91
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/qml/animation/qpauseanimationjob/BLACKLIST
View File

@ -1,5 +0,0 @@
[noTimerUpdates]
macos arm
[multiplePauseAnimations]
macos arm

6
tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp
View File

@ -114,7 +114,7 @@ void tst_QPauseAnimationJob::changeDirectionWhileRunning()
QTest::qWait(100);
QCOMPARE(animation.state(), QAbstractAnimationJob::Running);
animation.setDirection(QAbstractAnimationJob::Backward);
QTest::qWait(animation.totalDuration() + 50);
QTest::qWait(animation.totalDuration() + 100);
QCOMPARE(animation.state(), QAbstractAnimationJob::Stopped);
}
@ -142,7 +142,7 @@ void tst_QPauseAnimationJob::noTimerUpdates()
animation.start();
QTest::qWait(animation.totalDuration() + 100);
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
if (animation.state() != QAbstractAnimationJob::Stopped)
QEXPECT_FAIL("", timerError, Abort);
#endif
@ -171,7 +171,7 @@ void tst_QPauseAnimationJob::multiplePauseAnimations()
animation2.start();
QTest::qWait(animation.totalDuration() + 100);
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
if (animation.state() != QAbstractAnimationJob::Stopped)
QEXPECT_FAIL("", timerError, Abort);
#endif