git commit: Fixed the flaky FaultTolerance.SlaveReliableRegistration test.

[bmahler]

Updated Branches:
  refs/heads/master 9dbb5ecec -> 5efe7d7bb


Fixed the flaky FaultTolerance.SlaveReliableRegistration test.


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

Branch: refs/heads/master
Commit: 5efe7d7bb7a5cc1a2c2c4ed3a019ddc2da26b793
Parents: 9dbb5ec
Author: Benjamin Mahler <bmah...@twitter.com>
Authored: Fri Dec 6 12:58:38 2013 -0800
Committer: Benjamin Mahler <bmah...@twitter.com>
Committed: Fri Dec 6 12:58:38 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/5efe7d7b/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp 
b/src/tests/fault_tolerance_tests.cpp
index 075a192..60e06cc 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1576,8 +1576,6 @@ TEST_F(FaultToleranceTest, SchedulerExit)
 
 TEST_F(FaultToleranceTest, SlaveReliableRegistration)
 {
-  Clock::pause();
-
   Try<PID<Master> > master = StartMaster();
   ASSERT_SOME(master);
 
@@ -1592,7 +1590,9 @@ TEST_F(FaultToleranceTest, SlaveReliableRegistration)
   MesosSchedulerDriver driver(
       &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);
 
-  EXPECT_CALL(sched, registered(&driver, _, _));
+  Future<Nothing> registered;
+  EXPECT_CALL(sched, registered(&driver, _, _))
+    .WillOnce(FutureSatisfy(&registered));
 
   Future<Nothing> resourceOffers;
   EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -1601,8 +1601,11 @@ TEST_F(FaultToleranceTest, SlaveReliableRegistration)
 
   driver.start();
 
+  AWAIT_READY(registered);
+
   AWAIT_READY(slaveRegisteredMessage);
 
+  Clock::pause();
   Clock::advance(Seconds(1)); // TODO(benh): Pull out constant from Slave.
 
   AWAIT_READY(resourceOffers);