Repository: mesos
Updated Branches:
  refs/heads/master b2f5c62c9 -> 1a5a89bcd


Fixed a regression in the docker containerizer tests.

This was introduced by 3f6faa499c.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1a5a89bc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1a5a89bc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1a5a89bc

Branch: refs/heads/master
Commit: 1a5a89bcd1551dd2bd14879d5b458b7ca7c6ebdc
Parents: b2f5c62
Author: Benjamin Mahler <bmah...@apache.org>
Authored: Wed Sep 21 16:22:15 2016 -0700
Committer: Benjamin Mahler <bmah...@apache.org>
Committed: Wed Sep 21 16:23:12 2016 -0700

----------------------------------------------------------------------
 src/tests/containerizer/docker_containerizer_tests.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1a5a89bc/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 7e91494..d026142 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -1243,7 +1243,12 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover)
 
   ASSERT_FALSE(termination.isFailed());
 
-  AWAIT_FAILED(dockerContainerizer.wait(reapedContainerId));
+  // The reaped container should be cleaned up and unknown at this point.
+  Future<Option<ContainerTermination>> termination2 =
+    dockerContainerizer.wait(reapedContainerId);
+
+  AWAIT_READY(termination2);
+  EXPECT_NONE(termination2.get());
 
   // Expect the orphan to be stopped!
   AWAIT_READY(orphanRun);
@@ -1375,7 +1380,11 @@ TEST_F(DockerContainerizerTest, 
ROOT_DOCKER_KillOrphanContainers)
   ASSERT_FALSE(termination.isFailed());
 
   // The orphaned container should be correctly cleaned up.
-  AWAIT_FAILED(dockerContainerizer.wait(orphanContainerId));
+  Future<Option<ContainerTermination>> termination2 =
+    dockerContainerizer.wait(orphanContainerId);
+
+  AWAIT_READY(termination2);
+  EXPECT_NONE(termination2.get());
   ASSERT_FALSE(exists(docker, oldSlaveId, orphanContainerId));
 
   AWAIT_READY(orphanRun);

Reply via email to