mesos git commit: Fixed a flaky test.

[bm...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master bbd8381eb -> cf27a2fcf


Fixed a flaky test.

This fixes SlaveTest.IgnoreV0ExecutorIfItReregistersWithoutReconnect
to expect the shutdown to occur at most once, since it's possible
that when the test objects are being destructed, the executor's
shutdown method is not called.

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


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

Branch: refs/heads/master
Commit: cf27a2fcfcd7dc3c970904eff5b67aa13b5f94fb
Parents: bbd8381
Author: Benjamin Mahler <bm...@apache.org>
Authored: Tue Dec 5 14:35:45 2017 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Dec 5 14:36:59 2017 -0800

----------------------------------------------------------------------
 src/tests/slave_tests.cpp | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/cf27a2fc/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index eee6aa4..25cfd47 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -7892,6 +7892,7 @@ TEST_F(SlaveTest, IgnoreV0ExecutorIfItReregistersWithoutReconnect)
 
   Future<Nothing> executorShutdown;
   EXPECT_CALL(exec, shutdown(_))
+    .Times(AtMost(1))
     .WillOnce(FutureSatisfy(&executorShutdown));
 
   UPID executorPid = registerExecutorMessage->from;