[4/5] mesos git commit: Modified `FaultToleranceTest.SchedulerExit` to wait for shutdown.

[vi...@apache.org]

Modified `FaultToleranceTest.SchedulerExit` to wait for shutdown.

This change modified the existing test to wait for the shutdown
message instead of making a best-effort `AtMost` check for
the message.

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


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

Branch: refs/heads/master
Commit: 8c35ee31a9320acd829b35a6f7c7b189becd385c
Parents: 92b3541
Author: Anand Mazumdar <ma...@gmail.com>
Authored: Tue Mar 15 17:03:11 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Mar 15 17:03:11 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/8c35ee31/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 349669d..67f3627 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1580,12 +1580,17 @@ TEST_F(FaultToleranceTest, SchedulerExit)
   AWAIT_READY(status);
   EXPECT_EQ(TASK_RUNNING, status.get().state());
 
+  Future<Nothing> shutdown;
   EXPECT_CALL(exec, shutdown(_))
-    .Times(AtMost(1));
+    .WillOnce(FutureSatisfy(&shutdown));
 
   driver.stop();
   driver.join();
 
+  // Ensure that the executor receives a shutdown message after the
+  // scheduler exit.
+  AWAIT_READY(shutdown);
+
   Shutdown();
 }