You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/03/15 22:42:03 UTC
mesos git commit: Fixed runtime isolator tests out of disk issue.
Repository: mesos
Updated Branches:
refs/heads/master 6202ab156 -> a0c225418
Fixed runtime isolator tests out of disk issue.
Review: https://reviews.apache.org/r/44753/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a0c22541
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a0c22541
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a0c22541
Branch: refs/heads/master
Commit: a0c225418df53e714fa76cc3037bb8ccec213a7c
Parents: 6202ab1
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Mar 15 14:41:48 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Mar 15 14:41:48 2016 -0700
----------------------------------------------------------------------
.../containerizer/provisioner_docker_tests.cpp | 7 ++-----
src/tests/containerizer/runtime_isolator_tests.cpp | 16 +++++-----------
2 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a0c22541/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index 9fd5ea9..b2663a8 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -326,10 +326,7 @@ TEST_F(ProvisionerDockerPullerTest, ROOT_LocalPullerShellCommand)
Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
- Try<string> mkdtemp = environment->mkdtemp();
- ASSERT_SOME(mkdtemp);
-
- const string directory = path::join(mkdtemp.get(), "archives");
+ const string directory = path::join(os::getcwd(), "archives");
Future<Nothing> testImage = DockerArchive::create(directory, "alpine");
AWAIT_READY(testImage);
@@ -340,7 +337,7 @@ TEST_F(ProvisionerDockerPullerTest, ROOT_LocalPullerShellCommand)
flags.isolation = "docker/runtime,filesystem/linux";
flags.image_providers = "docker";
flags.docker_registry = directory;
- flags.docker_store_dir = path::join(flags.work_dir, "docker");
+ flags.docker_store_dir = path::join(os::getcwd(), "store");
Try<PID<Slave>> slave = StartSlave(flags);
ASSERT_SOME(slave);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a0c22541/src/tests/containerizer/runtime_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/runtime_isolator_tests.cpp b/src/tests/containerizer/runtime_isolator_tests.cpp
index d8a0004..1625614 100644
--- a/src/tests/containerizer/runtime_isolator_tests.cpp
+++ b/src/tests/containerizer/runtime_isolator_tests.cpp
@@ -76,10 +76,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultCmdLocalPuller)
Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
- Try<string> mkdtemp = environment->mkdtemp();
- ASSERT_SOME(mkdtemp);
-
- const string directory = path::join(mkdtemp.get(), "archives");
+ const string directory = path::join(os::getcwd(), "archives");
Future<Nothing> testImage =
DockerArchive::create(directory, "alpine", "null", "[\"sh\"]");
@@ -96,7 +93,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultCmdLocalPuller)
// Make docker store directory as a temparary directory. Because the
// manifest of the test image is changeable, the image cached on
// previous tests should never be used.
- flags.docker_store_dir = path::join(flags.work_dir, "docker");
+ flags.docker_store_dir = path::join(os::getcwd(), "store");
Try<PID<Slave>> slave = StartSlave(flags);
ASSERT_SOME(slave);
@@ -167,10 +164,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultEntryptLocalPuller)
Try<PID<Master>> master = StartMaster();
ASSERT_SOME(master);
- Try<string> mkdtemp = environment->mkdtemp();
- ASSERT_SOME(mkdtemp);
-
- const string directory = path::join(mkdtemp.get(), "archives");
+ const string directory = path::join(os::getcwd(), "archives");
Future<Nothing> testImage =
DockerArchive::create(directory, "alpine", "[\"echo\"]", "null");
@@ -183,7 +177,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultEntryptLocalPuller)
flags.isolation = "docker/runtime,filesystem/linux";
flags.image_providers = "docker";
flags.docker_registry = directory;
- flags.docker_store_dir = path::join(flags.work_dir, "docker");
+ flags.docker_store_dir = path::join(os::getcwd(), "store");
Try<PID<Slave>> slave = StartSlave(flags);
ASSERT_SOME(slave);
@@ -258,7 +252,7 @@ TEST_F(DockerRuntimeIsolatorTest,
flags.isolation = "docker/runtime,filesystem/linux";
flags.image_providers = "docker";
flags.docker_registry = "https://registry-1.docker.io";
- flags.docker_store_dir = path::join(flags.work_dir, "docker");
+ flags.docker_store_dir = path::join(os::getcwd(), "store");
Try<PID<Slave>> slave = StartSlave(flags);
ASSERT_SOME(slave);