mesos git commit: Fixed the flaky test SlaveTest.TaskLaunchContainerizerUpdateFails.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master c6f0a20f3 -> 8aab0f4c4


Fixed the flaky test SlaveTest.TaskLaunchContainerizerUpdateFails.

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


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

Branch: refs/heads/master
Commit: 8aab0f4c4635783ab936abc48b0c35805cd94cc9
Parents: c6f0a20
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Feb 23 12:51:06 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Feb 23 13:41:14 2015 -0800

----------------------------------------------------------------------
 src/tests/slave_tests.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8aab0f4c/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 60c9f35..7ea012a 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -58,17 +58,12 @@
 #include "tests/flags.hpp"
 #include "tests/mesos.hpp"
 
+using namespace mesos::internal::slave;
+
 using namespace process;
 
 using mesos::internal::master::Master;
 
-using mesos::internal::slave::Containerizer;
-using mesos::internal::slave::Fetcher;
-using mesos::internal::slave::GarbageCollectorProcess;
-using mesos::internal::slave::MesosContainerizer;
-using mesos::internal::slave::MesosContainerizerProcess;
-using mesos::internal::slave::Slave;
-
 using std::map;
 using std::string;
 using std::vector;
@@ -1181,7 +1176,6 @@ TEST_F(SlaveTest, TaskLaunchContainerizerUpdateFails)
   ASSERT_SOME(master);
 
   MockExecutor exec(DEFAULT_EXECUTOR_ID);
-  EXPECT_CALL(exec, registered(_, _, _, _));
 
   TestContainerizer containerizer(&exec);
 
@@ -1199,6 +1193,11 @@ TEST_F(SlaveTest, TaskLaunchContainerizerUpdateFails)
     .WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, "1", "128", "*"))
     .WillRepeatedly(Return()); // Ignore subsequent offers.
 
+  // The executor may not receive the ExecutorRegisteredMessage if the
+  // container is destroyed before that.
+  EXPECT_CALL(exec, registered(_, _, _, _))
+    .Times(AtMost(1));
+
   // Set up the containerizer so update() will fail.
   EXPECT_CALL(containerizer, update(_, _))
     .WillOnce(Return(Failure("update() failed")))