Used 'flags.docker' in tests. And some other minor style cleanups.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/109296f1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/109296f1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/109296f1 Branch: refs/heads/master Commit: 109296f1365eff9176af29c14ff90b9e206de4bd Parents: 1f994fd Author: Benjamin Hindman <[email protected]> Authored: Sun Jun 29 13:36:27 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:16 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/109296f1/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 3941d5a..cdf925d 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -21,6 +21,7 @@ #include <process/future.hpp> +#include "tests/flags.hpp" #include "tests/mesos.hpp" #include "slave/slave.hpp" @@ -66,7 +67,7 @@ public: const process::PID<Slave>& slavePid, bool checkpoint) { - // Keeping the last launched container id + // Keeping the last launched container id. lastContainerId = containerId; return slave::DockerContainerizer::launch( containerId, @@ -90,7 +91,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) slave::Flags flags = CreateSlaveFlags(); - Docker docker("docker"); + Docker docker(tests::flags.docker); MockDockerContainerizer dockerContainer(flags, true, docker); @@ -155,8 +156,8 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) bool foundContainer = false; string expectedName = "mesos-" + dockerContainer.lastContainerId.value(); - foreach(const Docker::Container& container, containers.get()) { - // Docker inspect name contains an extra slash in the beginning + foreach (const Docker::Container& container, containers.get()) { + // Docker inspect name contains an extra slash in the beginning. if (strings::contains(container.name(), expectedName)) { foundContainer = true; break; @@ -173,7 +174,8 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) Shutdown(); } -// This test tests DockerContainerizer::usage() + +// This test tests DockerContainerizer::usage(). TEST_F(DockerContainerizerTest, DOCKER_Usage) { Try<PID<Master> > master = StartMaster(); @@ -181,7 +183,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) slave::Flags flags = CreateSlaveFlags(); - Docker docker("docker"); + Docker docker(tests::flags.docker); MockDockerContainerizer dockerContainer(flags, true, docker); @@ -249,7 +251,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) dockerContainer.destroy(dockerContainer.lastContainerId); - // Usage() should fail again since the container is destroyed + // Usage() should fail again since the container is destroyed. usage = dockerContainer.usage(dockerContainer.lastContainerId); AWAIT_FAILED(usage);
