git commit: Fixed FaultToleranceTest.SlaveReregisterTerminatedExecutor test.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 207618231 -> 9fd2da85d


Fixed FaultToleranceTest.SlaveReregisterTerminatedExecutor test.

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


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

Branch: refs/heads/master
Commit: 9fd2da85d49525ea2abf7279dd42d988ca229632
Parents: 2076182
Author: Vinod Kone <vi...@gmail.com>
Authored: Tue Jun 24 16:50:03 2014 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jun 24 16:50:17 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/9fd2da85/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 5469c17..ac65050 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1933,6 +1933,11 @@ TEST_F(FaultToleranceTest, SlaveReregisterTerminatedExecutor)
   EXPECT_CALL(sched, statusUpdate(&driver, _))
     .WillOnce(FutureArg<1>(&status2));
 
+  // We drop the 'UpdateFrameworkMessage' from the master to slave to
+  // stop the status update manager from retrying the update that was
+  // already sent due to the new master detection.
+  DROP_PROTOBUFS(UpdateFrameworkMessage(), _, _);
+
   detector.appoint(master.get());
 
   AWAIT_READY(status2);