Repository: mesos Updated Branches: refs/heads/master c581b3f3c -> 0f647a619
Fixed docker validation and only run docker tests on linux with root. Review: https://reviews.apache.org/r/24361 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0f647a61 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0f647a61 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0f647a61 Branch: refs/heads/master Commit: 0f647a61923f0202b45d1151663887358003d488 Parents: c581b3f Author: Timothy Chen <[email protected]> Authored: Tue Aug 5 19:33:05 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Tue Aug 5 19:33:06 2014 -0700 ---------------------------------------------------------------------- src/tests/docker_containerizer_tests.cpp | 12 ++++++------ src/tests/docker_tests.cpp | 2 +- src/tests/environment.cpp | 10 ++++------ 3 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0f647a61/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index e936e7e..a559836 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -180,7 +180,7 @@ public: // requires running linux VM and need special port forwarding // to get host networking to work. #ifdef __linux__ -TEST_F(DockerContainerizerTest, DOCKER_Launch_Executor) +TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master); @@ -281,7 +281,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch_Executor) #endif // __linux__ -TEST_F(DockerContainerizerTest, DOCKER_Launch) +TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master); @@ -368,7 +368,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) } -TEST_F(DockerContainerizerTest, DOCKER_Kill) +TEST_F(DockerContainerizerTest, ROOT_DOCKER_Kill) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master); @@ -465,7 +465,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Kill) // This test tests DockerContainerizer::usage(). -TEST_F(DockerContainerizerTest, DOCKER_Usage) +TEST_F(DockerContainerizerTest, ROOT_DOCKER_Usage) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master); @@ -585,7 +585,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Usage) #ifdef __linux__ -TEST_F(DockerContainerizerTest, DOCKER_Update) +TEST_F(DockerContainerizerTest, ROOT_DOCKER_Update) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master); @@ -721,7 +721,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Update) // to finish. One way to do this is to mock the Docker interface // and let the mocked docker collect all the remove futures and // at the end of the test wait for all of them before the test exits. -TEST_F(DockerContainerizerTest, DISABLED_DOCKER_Recover) +TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_Recover) { slave::Flags flags = CreateSlaveFlags(); http://git-wip-us.apache.org/repos/asf/mesos/blob/0f647a61/src/tests/docker_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_tests.cpp b/src/tests/docker_tests.cpp index 1951d9a..4ef1df4 100644 --- a/src/tests/docker_tests.cpp +++ b/src/tests/docker_tests.cpp @@ -40,7 +40,7 @@ using std::string; // This test tests the functionality of the docker's interfaces. -TEST(DockerTest, DOCKER_interface) +TEST(DockerTest, ROOT_DOCKER_interface) { string containerName = "mesos-docker-test"; Resources resources = Resources::parse("cpus:1;mem:512").get(); http://git-wip-us.apache.org/repos/asf/mesos/blob/0f647a61/src/tests/environment.cpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp index eec7d3e..a6cc772 100644 --- a/src/tests/environment.cpp +++ b/src/tests/environment.cpp @@ -136,6 +136,7 @@ static bool enable(const ::testing::TestInfo& test) } if (strings::contains(name, "DOCKER_")) { +#ifdef __linux__ Try<Docker> docker = Docker::create(flags.docker); if (docker.isError()) { std::cerr @@ -147,12 +148,9 @@ static bool enable(const ::testing::TestInfo& test) return false; } - -#ifdef __linux__ - if (user.get() != "root") { - return false; - } -#endif +#else + return false; +#endif // __linux__ } }
