You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/10/16 00:53:47 UTC
[1/2] mesos git commit: Fixed minor style issues in Provider tests.
Repository: mesos
Updated Branches:
refs/heads/master f637d7442 -> af3dd6527
Fixed minor style issues in Provider tests.
Review: https://reviews.apache.org/r/39197
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/af3dd652
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/af3dd652
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/af3dd652
Branch: refs/heads/master
Commit: af3dd65272da7961ae65130c7fa5894dfbfb915e
Parents: af83f2b
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Thu Oct 15 04:43:30 2015 +0000
Committer: Timothy Chen <tn...@gmail.com>
Committed: Thu Oct 15 22:53:04 2015 +0000
----------------------------------------------------------------------
.../containerizer/provisioner_docker_tests.cpp | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/af3dd652/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 882eb70..822aa77 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -744,11 +744,15 @@ public:
const slave::Flags& flags,
const vector<string>& layers)
{
- string layersPath = path::join(flags.docker_store_dir, "layers");
+ const string layersPath = path::join(flags.docker_store_dir, "layers");
// Verify contents of the image in store directory.
- string layerPath1 = getImageLayerRootfsPath(flags.docker_store_dir, "123");
- string layerPath2 = getImageLayerRootfsPath(flags.docker_store_dir, "456");
+ const string layerPath1 =
+ getImageLayerRootfsPath(flags.docker_store_dir, "123");
+
+ const string layerPath2 =
+ getImageLayerRootfsPath(flags.docker_store_dir, "456");
+
EXPECT_TRUE(os::exists(layerPath1));
EXPECT_TRUE(os::exists(layerPath2));
EXPECT_SOME_EQ(
@@ -770,8 +774,8 @@ protected:
{
TemporaryDirectoryTest::SetUp();
- string imageDir = path::join(os::getcwd(), "images");
- string image = path::join(imageDir, "abc:latest");
+ const string imageDir = path::join(os::getcwd(), "images");
+ const string image = path::join(imageDir, "abc:latest");
ASSERT_SOME(os::mkdir(imageDir));
ASSERT_SOME(os::mkdir(image));
@@ -831,8 +835,8 @@ protected:
// stored in the proper locations accessible to the Docker provisioner.
TEST_F(ProvisionerDockerLocalStoreTest, LocalStoreTestWithTar)
{
- string imageDir = path::join(os::getcwd(), "images");
- string image = path::join(imageDir, "abc:latest");
+ const string imageDir = path::join(os::getcwd(), "images");
+ const string image = path::join(imageDir, "abc:latest");
ASSERT_SOME(os::mkdir(imageDir));
ASSERT_SOME(os::mkdir(image));
[2/2] mesos git commit: Removed extraneous sandbox directory in
Puller tests.
Posted by tn...@apache.org.
Removed extraneous sandbox directory in Puller tests.
Review: https://reviews.apache.org/r/39196
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/af83f2b3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/af83f2b3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/af83f2b3
Branch: refs/heads/master
Commit: af83f2b344634943718833c8222ec23c3bcff6fc
Parents: f637d74
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Thu Oct 15 04:43:14 2015 +0000
Committer: Timothy Chen <tn...@gmail.com>
Committed: Thu Oct 15 22:53:04 2015 +0000
----------------------------------------------------------------------
src/tests/containerizer/provisioner_docker_tests.cpp | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/af83f2b3/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 9c3c45a..882eb70 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -844,9 +844,6 @@ TEST_F(ProvisionerDockerLocalStoreTest, LocalStoreTestWithTar)
Try<Owned<slave::Store>> store = slave::docker::Store::create(flags);
ASSERT_SOME(store);
- string sandbox = path::join(os::getcwd(), "sandbox");
- ASSERT_SOME(os::mkdir(sandbox));
-
Image mesosImage;
mesosImage.set_type(Image::DOCKER);
mesosImage.mutable_docker()->set_name("abc");
@@ -870,9 +867,6 @@ TEST_F(ProvisionerDockerLocalStoreTest, MetadataManagerInitialization)
Try<Owned<slave::Store>> store = slave::docker::Store::create(flags);
ASSERT_SOME(store);
- string sandbox = path::join(os::getcwd(), "sandbox");
- ASSERT_SOME(os::mkdir(sandbox));
-
Image image;
image.set_type(Image::DOCKER);
image.mutable_docker()->set_name("abc");