mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From y..@apache.org
Subject mesos git commit: Some leftover fix from the provisioner unification.
Date Tue, 22 Sep 2015 16:16:35 GMT
Repository: mesos
Updated Branches:
  refs/heads/master fd7b8ee08 -> 8d53a932b


Some leftover fix from the provisioner unification.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8d53a932
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8d53a932
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8d53a932

Branch: refs/heads/master
Commit: 8d53a932bbf281e2147455cb06d2197c1e97755f
Parents: fd7b8ee
Author: Jiang Yan Xu <yan@jxu.me>
Authored: Tue Sep 22 09:15:18 2015 -0700
Committer: Jiang Yan Xu <yan@jxu.me>
Committed: Tue Sep 22 09:16:13 2015 -0700

----------------------------------------------------------------------
 .../containerizer/provisioner_appc_tests.cpp      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8d53a932/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index bd9b2e8..3da759a 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -326,8 +326,8 @@ TEST_F(ProvisionerAppcTest, Recover)
   flags.work_dir = "work_dir";
 
   Fetcher fetcher;
-  Try<Owned<Provisioner>> provisioners1 = Provisioner::create(flags, &fetcher);
-  ASSERT_SOME(provisioners1);
+  Try<Owned<Provisioner>> provisioner1 = Provisioner::create(flags, &fetcher);
+  ASSERT_SOME(provisioner1);
 
   // Create a simple image in the store:
   // <store>
@@ -359,7 +359,7 @@ TEST_F(ProvisionerAppcTest, Recover)
       os::write(path::join(imagePath, "manifest"), stringify(manifest)));
 
   // Recover. This is when the image in the store is loaded.
-  AWAIT_READY(provisioners1.get()->recover({}, {}));
+  AWAIT_READY(provisioner1.get()->recover({}, {}));
 
   Image image;
   image.mutable_appc()->set_name("foo.com/bar");
@@ -367,12 +367,12 @@ TEST_F(ProvisionerAppcTest, Recover)
   ContainerID containerId;
   containerId.set_value(UUID::random().toString());
 
-  Future<string> rootfs = provisioners1.get()->provision(containerId, image);
+  Future<string> rootfs = provisioner1.get()->provision(containerId, image);
   AWAIT_READY(rootfs);
 
   // Create a new provisioner to recover the state from the container.
-  Try<Owned<Provisioner>> provisioners2 = Provisioner::create(flags, &fetcher);
-  ASSERT_SOME(provisioners2);
+  Try<Owned<Provisioner>> provisioner2 = Provisioner::create(flags, &fetcher);
+  ASSERT_SOME(provisioner2);
 
   mesos::slave::ContainerState state;
 
@@ -382,11 +382,11 @@ TEST_F(ProvisionerAppcTest, Recover)
   // ExecutorInfo.
   state.mutable_container_id()->CopyFrom(containerId);
 
-  AWAIT_READY(provisioners2.get()->recover({state}, {}));
+  AWAIT_READY(provisioner2.get()->recover({state}, {}));
 
   // It's possible for the user to provision two different rootfses
   // from the same image.
-  AWAIT_READY(provisioners2.get()->provision(containerId, image));
+  AWAIT_READY(provisioner2.get()->provision(containerId, image));
 
   string provisionerDir = slave::paths::getProvisionerDir(flags.work_dir);
 
@@ -406,7 +406,7 @@ TEST_F(ProvisionerAppcTest, Recover)
   ASSERT_TRUE(rootfses->contains(flags.image_provisioner_backend));
   EXPECT_EQ(2u, rootfses->get(flags.image_provisioner_backend)->size());
 
-  Future<bool> destroy = provisioners2.get()->destroy(containerId);
+  Future<bool> destroy = provisioner2.get()->destroy(containerId);
   AWAIT_READY(destroy);
   EXPECT_TRUE(destroy.get());
 


Mime
View raw message