diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-01-23 14:50:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 09:15:47 +0100 |
| commit | f7ca7ae50ef1e36a85dc3eb8541aaa8907176447 (patch) | |
| tree | d71b3dfc7475ca97e9c3dfdda460e3f4ee465cb4 | |
| parent | 73b54f85c543d7e6de4194c1e6c91aa9ce79902d (diff) | |
| download | qtbase-f7ca7ae50ef1e36a85dc3eb8541aaa8907176447.tar.gz qtbase-f7ca7ae50ef1e36a85dc3eb8541aaa8907176447.tar.bz2 qtbase-f7ca7ae50ef1e36a85dc3eb8541aaa8907176447.zip | |
Make the QEXPECT_FAIL agree with the QVERIFY2 condition below
Even if the system is not under high load, this test can generate 4
updates on Windows. This is seems to be because the timer actually
triggers before its supposed to (sometimes the second start() triggers
an update right before the animation is done (at timestamp 399 for
instance), forcing it to generate yet another timer event in order to
reach the end)).
Under high load conditions, too many things can break this test,
usually it finishes even before the pause(), causing the
QVERIFY(animation.state() == QAbstractAnimation::Paused);
to fail.
Change-Id: Id94c0d16656675bc6165b7795f3c41a30616a3ba
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp index 529069552b..419fa1af20 100644 --- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp @@ -262,7 +262,7 @@ void tst_QPauseAnimation::pauseResume() QTRY_COMPARE(animation.state(), QAbstractAnimation::Stopped); #ifdef Q_OS_WIN - if (animation.m_updateCurrentTimeCount != 3) + if (animation.m_updateCurrentTimeCount < 3) QEXPECT_FAIL("", winTimerError, Abort); #endif QVERIFY2(animation.m_updateCurrentTimeCount >= 3, qPrintable( |