You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/11/02 11:36:26 UTC
mesos git commit: Fixed the unit test that missed the TASK_STARTING
update.
Repository: mesos
Updated Branches:
refs/heads/master 3c58d1caa -> 5060bdac8
Fixed the unit test that missed the TASK_STARTING update.
Review: https://reviews.apache.org/r/63497/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5060bdac
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5060bdac
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5060bdac
Branch: refs/heads/master
Commit: 5060bdac8b7990c1fbdf948d88ea8d7463670b79
Parents: 3c58d1c
Author: Qian Zhang <zh...@gmail.com>
Authored: Thu Nov 2 12:35:46 2017 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Nov 2 12:35:46 2017 +0100
----------------------------------------------------------------------
src/tests/containerizer/docker_containerizer_tests.cpp | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5060bdac/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index ad05da6..67945dd 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -4224,11 +4224,13 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NoTransitionFromKillingToFinished)
Invoke(&containerizer,
&MockDockerContainerizer::_launch)));
+ Future<TaskStatus> statusStarting;
Future<TaskStatus> statusRunning;
Future<TaskStatus> statusKilling;
Future<TaskStatus> statusKilled;
EXPECT_CALL(sched, statusUpdate(&driver, _))
+ .WillOnce(FutureArg<1>(&statusStarting))
.WillOnce(FutureArg<1>(&statusRunning))
.WillOnce(FutureArg<1>(&statusKilling))
.WillOnce(FutureArg<1>(&statusKilled));
@@ -4236,6 +4238,10 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_NoTransitionFromKillingToFinished)
driver.launchTasks(offers->front().id(), {task});
AWAIT_READY_FOR(containerId, Seconds(60));
+
+ AWAIT_READY(statusStarting);
+ EXPECT_EQ(TASK_STARTING, statusStarting->state());
+
AWAIT_READY_FOR(statusRunning, Seconds(60));
EXPECT_EQ(TASK_RUNNING, statusRunning->state());