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/01 11:54:49 UTC
[2/5] 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/8e3cb6ae
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8e3cb6ae
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8e3cb6ae
Branch: refs/heads/master
Commit: 8e3cb6ae6ca7d25fe768467ecc0a65f7509fce43
Parents: 0449a08
Author: Qian Zhang <zh...@gmail.com>
Authored: Thu Sep 14 17:33:05 2017 +0800
Committer: Qian Zhang <zh...@gmail.com>
Committed: Wed Nov 1 15:34:10 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/8e3cb6ae/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 5a2af59..0d68dd6 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -1802,13 +1802,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);