Repository: mesos Updated Branches: refs/heads/master aa54701a4 -> c694a450d
Fixed 'PortMappingMesosTest.ROOT_NetworkNamespaceHandleSymlink'. The test was broken in 'de11f0ffed36fbabc8fb4167859fd23b75f43f10', due to the scheduler sending an additional, unexpected status update. Review: https://reviews.apache.org/r/63148/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c694a450 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c694a450 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c694a450 Branch: refs/heads/master Commit: c694a450d1072982728982a010c0199973f9dd3a Parents: aa54701 Author: Benno Evers <bev...@mesosphere.com> Authored: Thu Oct 19 08:15:02 2017 -0700 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Oct 19 08:15:02 2017 -0700 ---------------------------------------------------------------------- src/tests/containerizer/port_mapping_tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c694a450/src/tests/containerizer/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp index a25f372..7b0c3e3 100644 --- a/src/tests/containerizer/port_mapping_tests.cpp +++ b/src/tests/containerizer/port_mapping_tests.cpp @@ -2210,15 +2210,21 @@ TEST_F(PortMappingMesosTest, ROOT_NetworkNamespaceHandleSymlink) // Start a long running task using network islator. TaskInfo task = createTask(offers.get()[0], "sleep 1000"); + Future<TaskStatus> status0; Future<TaskStatus> status1; Future<TaskStatus> status2; EXPECT_CALL(sched, statusUpdate(&driver, _)) + .WillOnce(FutureArg<1>(&status0)) .WillOnce(FutureArg<1>(&status1)) .WillOnce(FutureArg<1>(&status2)) .WillRepeatedly(Return()); // Ignore subsequent updates. driver.launchTasks(offers.get()[0].id(), {task}); + AWAIT_READY(status0); + EXPECT_EQ(task.task_id(), status0->task_id()); + EXPECT_EQ(TASK_STARTING, status0->state()); + AWAIT_READY(status1); EXPECT_EQ(task.task_id(), status1->task_id()); EXPECT_EQ(TASK_RUNNING, status1->state());
