diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-01-23 14:56:50 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2017-01-24 10:37:14 +0000 |
| commit | 941fb369ebfa7d44e5db0f589d81159fe156cf88 (patch) | |
| tree | a13a8b8dfefac49223498a4e7847c295802b3a15 /tests/auto/qml/animation | |
| parent | f1c37497238be8960a5408fc3b7abc65c3774061 (diff) | |
Stabilize test
Obviously, if the animation still hasn't stopped, we cannot expect it to
fail on the next QTRY_COMPARE, since that might wait until it then passes,
thus CI will log that as an XPASS.
This failed during CI run for MSVC 2015:
XPASS : tst_QPauseAnimationJob::multipleSequentialGroups() QCOMPARE(((group.state())), QAbstractAnimationJob::Stopped) returned TRUE unexpectedly.
tst_qpauseanimationjob.cpp(396) : failure location
Change-Id: I25151123b8fc2617f2a4d3690215e6a1ed2856ff
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/qml/animation')
| -rw-r--r-- | tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp index 1791407934..ff295c5409 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp +++ b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp @@ -392,8 +392,10 @@ void tst_QPauseAnimationJob::multipleSequentialGroups() #ifdef Q_OS_WIN if (group.state() != QAbstractAnimationJob::Stopped) QEXPECT_FAIL("", winTimerError, Abort); -#endif + QCOMPARE(group.state(), QAbstractAnimationJob::Stopped); +#else QTRY_COMPARE(group.state(), QAbstractAnimationJob::Stopped); +#endif #ifdef Q_OS_WIN if (subgroup1.state() != QAbstractAnimationJob::Stopped) |