You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/11/04 20:28:25 UTC
[2/2] mesos git commit: Avoid 'using namespace' clause in the test
containerizer.
Avoid 'using namespace' clause in the test containerizer.
Review: https://reviews.apache.org/r/53456
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8f976a8e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8f976a8e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8f976a8e
Branch: refs/heads/master
Commit: 8f976a8ef737f20b1c3c482f5cce81d4e70521ac
Parents: 250cfcb
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu Nov 3 23:08:06 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Nov 4 13:28:13 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer.cpp | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f976a8e/src/tests/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer.cpp b/src/tests/containerizer.cpp
index 32bdb87..c3bcb85 100644
--- a/src/tests/containerizer.cpp
+++ b/src/tests/containerizer.cpp
@@ -22,7 +22,8 @@
#include "tests/mesos.hpp"
-using namespace process;
+using process::Future;
+using process::Owned;
using std::map;
using std::shared_ptr;
@@ -348,7 +349,7 @@ TestContainerizer::TestContainerizer(
const shared_ptr<v1::MockHTTPExecutor>& executor)
: process(new TestContainerizerProcess(executorId, executor))
{
- spawn(process.get());
+ process::spawn(process.get());
setup();
}
@@ -357,7 +358,7 @@ TestContainerizer::TestContainerizer(
const hashmap<ExecutorID, Executor*>& executors)
: process(new TestContainerizerProcess(executors))
{
- spawn(process.get());
+ process::spawn(process.get());
setup();
}
@@ -367,7 +368,7 @@ TestContainerizer::TestContainerizer(
Executor* executor)
: process(new TestContainerizerProcess({{executorId, executor}}))
{
- spawn(process.get());
+ process::spawn(process.get());
setup();
}
@@ -375,7 +376,7 @@ TestContainerizer::TestContainerizer(
TestContainerizer::TestContainerizer(MockExecutor* executor)
: process(new TestContainerizerProcess({{executor->id, executor}}))
{
- spawn(process.get());
+ process::spawn(process.get());
setup();
}
@@ -383,14 +384,14 @@ TestContainerizer::TestContainerizer(MockExecutor* executor)
TestContainerizer::TestContainerizer()
: process(new TestContainerizerProcess())
{
- spawn(process.get());
+ process::spawn(process.get());
setup();
}
TestContainerizer::~TestContainerizer()
{
- terminate(process.get());
+ process::terminate(process.get());
process::wait(process.get());
}
@@ -456,7 +457,7 @@ void TestContainerizer::setup()
Future<Nothing> TestContainerizer::_recover(
const Option<slave::state::SlaveState>& state)
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::recover,
state);
@@ -484,7 +485,7 @@ Future<bool> TestContainerizer::_launch(
const map<string, string>&,
bool) = &TestContainerizerProcess::launch;
- return dispatch(
+ return process::dispatch(
process.get(),
launch,
containerId,
@@ -513,7 +514,7 @@ Future<bool> TestContainerizer::_launch(
const Option<string>&,
const SlaveID&) = &TestContainerizerProcess::launch;
- return dispatch(
+ return process::dispatch(
process.get(),
launch,
containerId,
@@ -528,7 +529,7 @@ Future<Nothing> TestContainerizer::_update(
const ContainerID& containerId,
const Resources& resources)
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::update,
containerId,
@@ -539,7 +540,7 @@ Future<Nothing> TestContainerizer::_update(
Future<ResourceStatistics> TestContainerizer::_usage(
const ContainerID& containerId)
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::usage,
containerId);
@@ -549,7 +550,7 @@ Future<ResourceStatistics> TestContainerizer::_usage(
Future<ContainerStatus> TestContainerizer::_status(
const ContainerID& containerId)
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::status,
containerId);
@@ -559,7 +560,7 @@ Future<ContainerStatus> TestContainerizer::_status(
Future<Option<mesos::slave::ContainerTermination>> TestContainerizer::_wait(
const ContainerID& containerId)
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::wait,
containerId);
@@ -573,7 +574,7 @@ Future<bool> TestContainerizer::_destroy(
Future<bool> (TestContainerizerProcess::*destroy)(
const ContainerID&) = &TestContainerizerProcess::destroy;
- return dispatch(
+ return process::dispatch(
process.get(),
destroy,
containerId);
@@ -589,7 +590,7 @@ Future<bool> TestContainerizer::destroy(
const FrameworkID&,
const ExecutorID&) = &TestContainerizerProcess::destroy;
- return dispatch(
+ return process::dispatch(
process.get(),
destroy,
frameworkId,
@@ -599,7 +600,7 @@ Future<bool> TestContainerizer::destroy(
Future<hashset<ContainerID>> TestContainerizer::containers()
{
- return dispatch(
+ return process::dispatch(
process.get(),
&TestContainerizerProcess::containers);
}