Repository: mesos Updated Branches: refs/heads/master 415451ee8 -> fcc8ca168
Fixed flaky `TerminatedNestedStatus` test. This patch adds call of `destroy()` for a parent container. Review: https://reviews.apache.org/r/67317/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fcc8ca16 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fcc8ca16 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fcc8ca16 Branch: refs/heads/master Commit: fcc8ca168523c4bd5b3c1b748a60c8926fe66ef5 Parents: 415451e Author: Andrei Budnik <abud...@mesosphere.com> Authored: Fri May 25 21:33:10 2018 +0800 Committer: Qian Zhang <zhq527...@gmail.com> Committed: Fri May 25 21:33:10 2018 +0800 ---------------------------------------------------------------------- .../containerizer/nested_mesos_containerizer_tests.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fcc8ca16/src/tests/containerizer/nested_mesos_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp index dac30d7..6050e6e 100644 --- a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp +++ b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp @@ -2761,6 +2761,15 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_TerminatedNestedStatus) ASSERT_SOME(nestedTermination.get()); ASSERT_TRUE(nestedTermination.get()->has_status()); EXPECT_WEXITSTATUS_EQ(42, nestedTermination.get()->status()); + + // Destroy the top-level container. + Future<Option<ContainerTermination>> termination = + containerizer->destroy(containerId); + + AWAIT_READY(termination); + ASSERT_SOME(termination.get()); + ASSERT_TRUE(termination.get()->has_status()); + EXPECT_WTERMSIG_EQ(SIGKILL, termination.get()->status()); }
