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/15 20:13:49 UTC
mesos git commit: Updated test
PortMappingMesosTest.CGROUPS_ROOT_CleanUpOrphan.
Repository: mesos
Updated Branches:
refs/heads/master e3e641328 -> 0eec1f39a
Updated test PortMappingMesosTest.CGROUPS_ROOT_CleanUpOrphan.
This test needed to be adapted to the new behaviour of the
built-in executors that are now sending TASK_STARTING
updates.
Review: https://reviews.apache.org/r/63846/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0eec1f39
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0eec1f39
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0eec1f39
Branch: refs/heads/master
Commit: 0eec1f39a60d75547b1ca714f193df0bda7beb7a
Parents: e3e6413
Author: Benno Evers <be...@mesosphere.com>
Authored: Wed Nov 15 21:13:14 2017 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Nov 15 21:13:14 2017 +0100
----------------------------------------------------------------------
src/tests/containerizer/port_mapping_tests.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0eec1f39/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 7b0c3e3..38db7e5 100644
--- a/src/tests/containerizer/port_mapping_tests.cpp
+++ b/src/tests/containerizer/port_mapping_tests.cpp
@@ -2089,15 +2089,20 @@ TEST_F(PortMappingMesosTest, CGROUPS_ROOT_CleanUpOrphan)
// Start a long running task using network islator.
TaskInfo task = createTask(offers.get()[0], "sleep 1000");
- EXPECT_CALL(sched, statusUpdate(_, _));
+ EXPECT_CALL(sched, statusUpdate(_, _))
+ .Times(2);
+
+ Future<Nothing> _statusUpdateAcknowledgement1 =
+ FUTURE_DISPATCH(_, &Slave::_statusUpdateAcknowledgement);
- Future<Nothing> _statusUpdateAcknowledgement =
+ Future<Nothing> _statusUpdateAcknowledgement2 =
FUTURE_DISPATCH(_, &Slave::_statusUpdateAcknowledgement);
driver.launchTasks(offers.get()[0].id(), {task});
- // Wait for the ACK to be checkpointed.
- AWAIT_READY(_statusUpdateAcknowledgement);
+ // Wait for the ACKs to be checkpointed.
+ AWAIT_READY(_statusUpdateAcknowledgement1);
+ AWAIT_READY(_statusUpdateAcknowledgement2);
Future<hashset<ContainerID>> containers = containerizer->containers();