Merge lp:~vanvugt/compiz/fix-1021139 into lp:compiz/0.9.8

[Sam Spilsbury]

Fixed CompTimerTestCallback.TimerOrder failure on slow systems (like valgrind)
(LP: #1021139)

If the environment (like valgrind in ExperimentalMemCheck) is so slow that it
took more than 50ms to schedule the tests, then they would all be overdue
on startup (instead of just one of them) and the order would not be
predictable. So I spread the timers out over longer intervals and reduced
the number of repetitions to stop the new test from taking too long.

Fixed CompTimerTestCallback.TimerOrder failure on slow systems (like valgrind)
(LP: #1021139)

If the environment (like valgrind in ExperimentalMemCheck) is so slow that it
took more than 50ms to schedule the tests, then they would all be overdue
on startup (instead of just one of them) and the order would not be
predictable. So I spread the timers out over longer intervals and reduced
the number of repetitions to stop the new test from taking too long.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3283
http://jenkins.qa.ubuntu.com/job/compiz-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/4/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

CI failure incorrect, resubmitting

[Sam Spilsbury (smspillaz)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3283
http://jenkins.qa.ubuntu.com/job/compiz-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/5/console

review: Approve (continuous-integration)

=== modified file 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
--- src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2012-03-30 16:30:13 +0000
+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2012-07-11 17:28:28 +0000
@@ -217,8 +217,8 @@
 
 TEST_F(CompTimerTestCallback, TimerOrder)
 {
-    AddTimer (100, 110, boost::bind (&MockCompTimerTestCallbackDispatchTable::callback1, mDispatchTable, 0), 10);
-    AddTimer (50, 90, boost::bind (&MockCompTimerTestCallbackDispatchTable::callback2, mDispatchTable, 1), 10);
+    AddTimer (1000, 1100, boost::bind (&MockCompTimerTestCallbackDispatchTable::callback1, mDispatchTable, 0), 3);
+    AddTimer (500, 900, boost::bind (&MockCompTimerTestCallbackDispatchTable::callback2, mDispatchTable, 1), 6);
     AddTimer (0, 0, boost::bind (&MockCompTimerTestCallbackDispatchTable::callback3, mDispatchTable, 2), 10);
 
     /* TimeoutHandler::timers should be empty since no timers have started */
@@ -235,18 +235,7 @@
     EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
     EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
     EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
-    EXPECT_CALL (*mDispatchTable, callback1 (0)).Times (1);
+    EXPECT_CALL (*mDispatchTable, callback2 (1)).Times (1);
 
     Run ();
 }