Fixed non-deterministic test. The DockerContainerizerTest.ROOT_DOCKER_PortMapping test was doing a Docker::kill on the container which should be finishing properly which was causing the call to Docker::kill to fail when the container had already finished properly and been cleaned up, thus causing the test to fail.
Review: https://reviews.apache.org/r/26630 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bd7561e8 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bd7561e8 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bd7561e8 Branch: refs/heads/master Commit: bd7561e8e6e65d94830d36e2276cd937ac6964b0 Parents: ed4f96f Author: Benjamin Hindman <[email protected]> Authored: Sun Oct 12 14:56:12 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Fri Oct 31 15:05:39 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/bd7561e8/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 67d60a8..d99e567 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -1853,10 +1853,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_PortMapping) ASSERT_SOME(s); AWAIT_READY_FOR(s.get().status(), Seconds(60)); - string container = slave::DOCKER_NAME_PREFIX + stringify(containerId.get()); - - AWAIT_READY_FOR(docker.kill(container, false), Seconds(30)); - AWAIT_READY_FOR(statusFinished, Seconds(60)); EXPECT_EQ(TASK_FINISHED, statusFinished.get().state());
