diff options
| author | Ulf Hermann <[email protected]> | 2022-01-18 14:26:38 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2022-01-20 11:51:18 +0100 |
| commit | 1fd5f00d91f60a04ea3d83f3bc1c7c9b820dfe39 (patch) | |
| tree | 19f02dc7ccc699b77ff64941cfe4362e7bfdcdfc /tests/auto/qml/animation | |
| parent | de30f10aeb1ccf495cf39b3910e89d60f3dc591a (diff) | |
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 <[email protected]>
Diffstat (limited to 'tests/auto/qml/animation')
| -rw-r--r-- | tests/auto/qml/animation/qpauseanimationjob/BLACKLIST | 5 | ||||
| -rw-r--r-- | tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/qml/animation/qpauseanimationjob/BLACKLIST b/tests/auto/qml/animation/qpauseanimationjob/BLACKLIST deleted file mode 100644 index 69b3710680..0000000000 --- a/tests/auto/qml/animation/qpauseanimationjob/BLACKLIST +++ /dev/null @@ -1,5 +0,0 @@ -[noTimerUpdates] -macos arm -[multiplePauseAnimations] -macos arm - diff --git a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp index dba6e531be..9a3da36a13 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp +++ b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp @@ -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 |