Await container termination in docker kill test
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c4b98ad3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c4b98ad3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c4b98ad3 Branch: refs/heads/master Commit: c4b98ad3720392d3e949e0254fa23fd8279ce985 Parents: 0bf53b4 Author: Timothy Chen <[email protected]> Authored: Wed Jul 9 22:48:02 2014 +0000 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:17 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c4b98ad3/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 9a780e7..d70518a 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -293,11 +293,16 @@ TEST_F(DockerContainerizerTest, DOCKER_Kill) EXPECT_CALL(sched, statusUpdate(&driver, _)) .WillOnce(FutureArg<1>(&statusKilled)); + Future<containerizer::Termination> termination = + dockerContainerizer.wait(containerId.get()); + driver.killTask(task.task_id()); AWAIT_READY(statusKilled); EXPECT_EQ(TASK_KILLED, statusKilled.get().state()); + AWAIT_READY(termination); + Future<list<Docker::Container> > containers = docker.ps(true, slave::DOCKER_NAME_PREFIX);
