You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by qi...@apache.org on 2017/11/14 12:40:26 UTC
[3/4] mesos git commit: Checked TASK_KILLED in the test
`ROOT_INTERNET_CURL_PortMapper`.
Checked TASK_KILLED in the test `ROOT_INTERNET_CURL_PortMapper`.
Review: https://reviews.apache.org/r/62327
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e9408127
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e9408127
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e9408127
Branch: refs/heads/1.4.x
Commit: e940812741d80b1ed3b5b3645f34e93e950ba119
Parents: 371959c
Author: Qian Zhang <zh...@gmail.com>
Authored: Thu Sep 14 17:33:05 2017 +0800
Committer: Qian Zhang <zh...@gmail.com>
Committed: Tue Nov 14 17:31:27 2017 +0800
----------------------------------------------------------------------
src/tests/containerizer/cni_isolator_tests.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e9408127/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index 60c85ad..0ff0867 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -1707,13 +1707,7 @@ TEST_F(CniIsolatorPortMapperTest, ROOT_INTERNET_CURL_PortMapper)
AWAIT_READY(statusKilled);
- // The executor would issue a SIGTERM to the container, followed by
- // a SIGKILL (in case the container ignores the SIGTERM). The
- // "nginx:alpine" container returns an "EXIT_STATUS" of 0 on
- // receiving a SIGTERM making the executor send a `TASK_FINISHED`
- // instead of a `TASK_KILLED`, hence checking for `TASK_FINISHED`
- // instead of `TASK_KILLED`.
- EXPECT_EQ(TASK_FINISHED, statusKilled.get().state());
+ EXPECT_EQ(TASK_KILLED, statusKilled.get().state());
AWAIT_READY(gcSchedule);