git commit: Fixed flaky FaultToleranceTest.SchedulerFailoverStatusUpdate.

[bm...@apache.org]

Updated Branches:
  refs/heads/master 82fd755f0 -> 48d7f62d6


Fixed flaky FaultToleranceTest.SchedulerFailoverStatusUpdate.

From: Jiang Yan Xu <ya...@jxu.me>
Review: https://reviews.apache.org/r/15946


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/48d7f62d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/48d7f62d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/48d7f62d

Branch: refs/heads/master
Commit: 48d7f62d6a9d59e9d596f3151f15d07236b24d64
Parents: 82fd755
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 2 14:49:03 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Dec 2 14:49:03 2013 -0800

----------------------------------------------------------------------
 src/tests/fault_tolerance_tests.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/48d7f62d/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 66ada33..27095cc 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1062,6 +1062,12 @@ TEST_F(FaultToleranceTest, SchedulerFailoverStatusUpdate)
   // Scheduler1 should get an error due to failover.
   EXPECT_CALL(sched1, error(&driver1, "Framework failed over"));
 
+  // Scheduler2 should receive retried status updates.
+  Future<Nothing> statusUpdate;
+  EXPECT_CALL(sched2, statusUpdate(&driver2, _))
+    .WillOnce(FutureSatisfy(&statusUpdate))
+    .WillRepeatedly(Return()); // Ignore subsequent updates.
+
   driver2.start();
 
   AWAIT_READY(registered2);
@@ -1070,10 +1076,6 @@ TEST_F(FaultToleranceTest, SchedulerFailoverStatusUpdate)
 
   // Now advance time enough for the reliable timeout
   // to kick in and another status update is sent.
-  Future<Nothing> statusUpdate;
-  EXPECT_CALL(sched2, statusUpdate(&driver2, _))
-    .WillOnce(FutureSatisfy(&statusUpdate));
-
   Clock::advance(STATUS_UPDATE_RETRY_INTERVAL_MIN);
 
   AWAIT_READY(statusUpdate);