You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/10/20 20:01:29 UTC
[3/5] mesos git commit: Removed unused tests helper macro
'DEFAULT_CONTAINER_ID'.
Removed unused tests helper macro 'DEFAULT_CONTAINER_ID'.
Review: https://reviews.apache.org/r/53014
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2373819d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2373819d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2373819d
Branch: refs/heads/master
Commit: 2373819dc3e3f8b251526db962eecde23de1545b
Parents: 78d4ec4
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Oct 18 20:54:41 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Thu Oct 20 12:33:29 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer/mesos_containerizer_tests.cpp | 7 +++++--
src/tests/mesos.hpp | 6 ------
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2373819d/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index a4a7e5b..e8d9b08 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -605,13 +605,16 @@ TEST_F(MesosContainerizerExecuteTest, ROOT_SandboxFileOwnership)
ASSERT_SOME(_containerizer);
Owned<MesosContainerizer> containerizer(_containerizer.get());
+ ContainerID containerId;
+ containerId.set_value(UUID::random().toString());
+
const string user = "nobody";
ExecutorInfo executor = createExecutorInfo("executor", "exit 0");
executor.mutable_command()->set_user(user);
Future<bool> launch = containerizer->launch(
- DEFAULT_CONTAINER_ID,
+ containerId,
None(),
executor,
sandbox,
@@ -639,7 +642,7 @@ TEST_F(MesosContainerizerExecuteTest, ROOT_SandboxFileOwnership)
// Wait on the container.
Future<Option<ContainerTermination>> wait =
- containerizer->wait(DEFAULT_CONTAINER_ID);
+ containerizer->wait(containerId);
AWAIT_READY(wait);
// Check the executor exited correctly.
http://git-wip-us.apache.org/repos/asf/mesos/blob/2373819d/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 9309b5a..a9af6e1 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -391,12 +391,6 @@ protected:
DEFAULT_V1_EXECUTOR_INFO.executor_id()
-#define DEFAULT_CONTAINER_ID \
- ({ ContainerID containerId; \
- containerId.set_value("container"); \
- containerId; })
-
-
inline mesos::Environment createEnvironment(
const hashmap<std::string, std::string>& map)
{