git commit: Fixed the flaky FaultToleranceTest.SlaveReregisterOnZKExpiration test.

[bm...@apache.org]

Updated Branches:
  refs/heads/master fa14ea423 -> e5cf7360a


Fixed the flaky FaultToleranceTest.SlaveReregisterOnZKExpiration test.


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

Branch: refs/heads/master
Commit: e5cf7360ab634954ae349ee1341b74f125c0f4dd
Parents: fa14ea4
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Dec 5 17:11:05 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Dec 5 17:28:47 2013 -0800

----------------------------------------------------------------------
 src/tests/fault_tolerance_tests.cpp | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e5cf7360/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 7157292..74d3447 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1616,10 +1616,15 @@ TEST_F(FaultToleranceTest, SlaveReregisterOnZKExpiration)
   Try<PID<Master> > master = StartMaster();
   ASSERT_SOME(master);
 
+  Future<SlaveRegisteredMessage> slaveRegisteredMessage =
+    FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _);
+
   StandaloneMasterDetector* detector = new StandaloneMasterDetector(master.get());
   Try<PID<Slave> > slave = StartSlave(Owned<MasterDetector>(detector));
   ASSERT_SOME(slave);
 
+  AWAIT_READY(slaveRegisteredMessage);
+
   MockScheduler sched;
   MesosSchedulerDriver driver(
       &sched, DEFAULT_FRAMEWORK_INFO, master.get(), DEFAULT_CREDENTIAL);