Renamed variable to be more accurate. Since we actually have a Docker::Container abstraction I s/dockerContainer/dockerContainerizer/.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5d78d0c2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5d78d0c2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5d78d0c2 Branch: refs/heads/master Commit: 5d78d0c2cb72b1a4ca6afd583123b2b34b75717a Parents: 57c1ec2 Author: Benjamin Hindman <[email protected]> Authored: Sun Jun 29 13:48:19 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:16 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5d78d0c2/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 17c4b1c..b716de4 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -93,9 +93,9 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) Docker docker(tests::flags.docker); - MockDockerContainerizer dockerContainer(flags, true, docker); + MockDockerContainerizer dockerContainerizer(flags, true, docker); - Try<PID<Slave> > slave = StartSlave((slave::Containerizer*) &dockerContainer); + Try<PID<Slave> > slave = StartSlave(&dockerContainerizer); ASSERT_SOME(slave); MockScheduler sched; @@ -155,7 +155,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) bool foundContainer = false; string expectedName = - slave::DOCKER_NAME_PREFIX + dockerContainer.lastContainerId.value(); + slave::DOCKER_NAME_PREFIX + dockerContainerizer.lastContainerId.value(); foreach (const Docker::Container& container, containers.get()) { // Docker inspect name contains an extra slash in the beginning. @@ -167,7 +167,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) ASSERT_TRUE(foundContainer); - dockerContainer.destroy(dockerContainer.lastContainerId); + dockerContainerizer.destroy(dockerContainerizer.lastContainerId); driver.stop(); driver.join(); @@ -186,9 +186,9 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) Docker docker(tests::flags.docker); - MockDockerContainerizer dockerContainer(flags, true, docker); + MockDockerContainerizer dockerContainerizer(flags, true, docker); - Try<PID<Slave> > slave = StartSlave((slave::Containerizer*) &dockerContainer); + Try<PID<Slave> > slave = StartSlave(&dockerContainerizer); ASSERT_SOME(slave); MockScheduler sched; @@ -237,7 +237,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) // Usage() should fail since the container is not launched. Future<ResourceStatistics> usage = - dockerContainer.usage(dockerContainer.lastContainerId); + dockerContainerizer.usage(dockerContainerizer.lastContainerId); AWAIT_FAILED(usage); @@ -246,14 +246,14 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) AWAIT_READY_FOR(statusRunning, Seconds(60)); EXPECT_EQ(TASK_RUNNING, statusRunning.get().state()); - usage = dockerContainer.usage(dockerContainer.lastContainerId); + usage = dockerContainerizer.usage(dockerContainerizer.lastContainerId); AWAIT_READY(usage); // TODO(yifan): Verify the usage. - dockerContainer.destroy(dockerContainer.lastContainerId); + dockerContainerizer.destroy(dockerContainerizer.lastContainerId); // Usage() should fail again since the container is destroyed. - usage = dockerContainer.usage(dockerContainer.lastContainerId); + usage = dockerContainerizer.usage(dockerContainerizer.lastContainerId); AWAIT_FAILED(usage); driver.stop();
