git commit: Fixed FaultToleranceTest.MasterFailover test.

[vi...@apache.org]

Updated Branches:
  refs/heads/master 53f584017 -> bb3805996


Fixed FaultToleranceTest.MasterFailover test.

Review: https://reviews.apache.org/r/14917


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

Branch: refs/heads/master
Commit: bb38059961f105efad5d0b1a4f4fbaade32ea0e5
Parents: 53f5840
Author: Vinod Kone <vi...@twitter.com>
Authored: Thu Oct 24 17:27:36 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Oct 24 17:54:24 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/bb380599/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index bef95fb..3989e14 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -612,12 +612,16 @@ TEST_F(FaultToleranceTest, MasterFailover)
   Future<process::Message> frameworkRegisteredMessage =
     FUTURE_MESSAGE(Eq(FrameworkRegisteredMessage().GetTypeName()), _, _);
 
-  EXPECT_CALL(sched, registered(&driver, _, _));
+  Future<Nothing> registered1;
+  EXPECT_CALL(sched, registered(&driver, _, _))
+    .WillOnce(FutureSatisfy(&registered1));
 
   driver.start();
 
   AWAIT_READY(frameworkRegisteredMessage);
 
+  AWAIT_READY(registered1);
+
   // Simulate failed over master by restarting the master.
   Stop(master.get());
   master = StartMaster();
@@ -628,9 +632,9 @@ TEST_F(FaultToleranceTest, MasterFailover)
   Future<AuthenticateMessage> authenticateMessage =
     FUTURE_PROTOBUF(AuthenticateMessage(), _, _);
 
-  Future<Nothing> registered;
+  Future<Nothing> registered2;
   EXPECT_CALL(sched, registered(&driver, _, _))
-    .WillOnce(FutureSatisfy(&registered));
+    .WillOnce(FutureSatisfy(&registered2));
 
   // Simulate a new master detected message to the scheduler.
   NewMasterDetectedMessage newMasterDetectedMsg;
@@ -642,7 +646,7 @@ TEST_F(FaultToleranceTest, MasterFailover)
   AWAIT_READY(authenticateMessage);
 
   // Framework should get a registered callback.
-  AWAIT_READY(registered);
+  AWAIT_READY(registered2);
 
   driver.stop();
   driver.join();