You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/10/28 11:52:24 UTC

mesos git commit: Silenced a GMock warning in ROOT_DOCKER_DockerInspectDiscard.

Repository: mesos
Updated Branches:
  refs/heads/master 2ab0fc383 -> 14cfdcfae


Silenced a GMock warning in ROOT_DOCKER_DockerInspectDiscard.

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


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

Branch: refs/heads/master
Commit: 14cfdcfaeaa1db2dc88143f2085d578e7d7cc596
Parents: 2ab0fc3
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Oct 28 13:52:32 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Fri Oct 28 13:52:32 2016 +0200

----------------------------------------------------------------------
 src/tests/containerizer/docker_containerizer_tests.cpp | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/14cfdcfa/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index a91bcad..810488d 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -3867,6 +3867,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
                     Invoke(&dockerContainerizer,
                            &MockDockerContainerizer::_launch)));
 
+  Future<Nothing> executorLost;
+  EXPECT_CALL(sched, executorLost(&driver, executorId, _, _))
+    .WillOnce(FutureSatisfy(&executorLost));
+
   driver.launchTasks(offers.get()[0].id(), {task});
 
   AWAIT_READY_FOR(containerId, Seconds(60));
@@ -3874,6 +3878,8 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_DockerInspectDiscard)
   AWAIT_READY(statusFailed);
   EXPECT_EQ(TASK_FAILED, statusFailed.get().state());
 
+  AWAIT_READY(executorLost);
+
   AWAIT_DISCARDED(inspect);
 
   driver.stop();