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/09/28 05:40:50 UTC
mesos git commit: Fixed the build caused the last commit.
Repository: mesos
Updated Branches:
refs/heads/master af5723034 -> 0cac9a949
Fixed the build caused the last commit.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0cac9a94
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0cac9a94
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0cac9a94
Branch: refs/heads/master
Commit: 0cac9a94920b40b6ad9a4eb34370069d2ebe2e04
Parents: af57230
Author: Jie Yu <yu...@gmail.com>
Authored: Tue Sep 27 22:40:43 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Sep 27 22:40:43 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/composing.cpp | 1 -
src/tests/api_tests.cpp | 2 +-
.../containerizer/volume_sandbox_path_isolator_tests.cpp | 8 --------
3 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0cac9a94/src/slave/containerizer/composing.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index 17eb34c..561a88f 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -469,7 +469,6 @@ Future<bool> ComposingContainerizerProcess::launch(
containerId,
commandInfo,
containerInfo,
- directory,
user,
slaveId)
.then(defer(self(),
http://git-wip-us.apache.org/repos/asf/mesos/blob/0cac9a94/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index 3ec4421..7b0ad3c 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -3354,7 +3354,7 @@ TEST_P(AgentAPITest, NestedContainerLaunchFalse)
{
// Return false here to indicate "unsupported".
- EXPECT_CALL(mockContainerizer, launch(_, _, _, _, _, _))
+ EXPECT_CALL(mockContainerizer, launch(_, _, _, _, _))
.WillOnce(Return(Future<bool>(false)));
v1::agent::Call call;
http://git-wip-us.apache.org/repos/asf/mesos/blob/0cac9a94/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
index 5105ff2..d4f074a 100644
--- a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
+++ b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp
@@ -105,14 +105,10 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedVolume)
sandboxPath->set_type(Volume::Source::SandboxPath::PARENT);
sandboxPath->set_path("shared");
- directory = environment->mkdtemp();
- ASSERT_SOME(directory);
-
launch = containerizer->launch(
nestedContainerId1,
CREATE_COMMAND_INFO("touch parent/file; sleep 1000"),
containerInfo,
- directory.get(),
None(),
state.id);
@@ -122,15 +118,11 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedVolume)
nestedContainerId2.mutable_parent()->CopyFrom(containerId);
nestedContainerId2.set_value(UUID::random().toString());
- directory = environment->mkdtemp();
- ASSERT_SOME(directory);
-
launch = containerizer->launch(
nestedContainerId2,
CREATE_COMMAND_INFO(
"while true; do if [ -f parent/file ]; then exit 0; fi; done"),
containerInfo,
- directory.get(),
None(),
state.id);