Repository: mesos Updated Branches: refs/heads/master 70035aad2 -> 2b4fb8356
Removed use of namespace aliases. Review: https://reviews.apache.org/r/34375 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2b4fb835 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2b4fb835 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2b4fb835 Branch: refs/heads/master Commit: 2b4fb8356c3d570bd2a77d396dadf5ee6ad9d236 Parents: 70035aa Author: Michael Park <[email protected]> Authored: Mon Jun 15 10:08:09 2015 +0200 Committer: Till Toenshoff <[email protected]> Committed: Mon Jun 15 10:08:15 2015 +0200 ---------------------------------------------------------------------- src/master/master.cpp | 22 +++++++++----------- src/slave/slave.cpp | 6 ++---- src/tests/master_tests.cpp | 45 ++++++++++++++++++++++++----------------- src/tests/slave_tests.cpp | 10 ++++----- 4 files changed, 43 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2b4fb835/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 3049e05..0137c37 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -112,8 +112,6 @@ namespace mesos { namespace internal { namespace master { -namespace http = process::http; - using mesos::master::RoleInfo; using mesos::master::allocator::Allocator; @@ -734,23 +732,23 @@ void Master::initialize() route("/health", Http::HEALTH_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { return http.health(request); }); route("/observe", Http::OBSERVE_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.observe(request); }); route("/redirect", Http::REDIRECT_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { return http.redirect(request); }); route("/roles.json", Http::ROLES_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.roles(request); }); @@ -759,38 +757,38 @@ void Master::initialize() // "/teardown". Remove this endpoint in 0.24.0. route("/shutdown", Http::SHUTDOWN_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.teardown(request); }); route("/teardown", Http::TEARDOWN_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.teardown(request); }); route("/slaves", Http::SLAVES_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.slaves(request); }); route("/state.json", Http::STATE_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.state(request); }); route("/state-summary", Http::STATESUMMARY_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.stateSummary(request); }); route("/tasks.json", Http::TASKS_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.tasks(request); }); http://git-wip-us.apache.org/repos/asf/mesos/blob/2b4fb835/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index 9af69d8..67732a4 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -110,8 +110,6 @@ namespace mesos { namespace internal { namespace slave { -namespace http = process::http; - using namespace state; Slave::Slave(const slave::Flags& _flags, @@ -494,12 +492,12 @@ void Slave::initialize() route("/health", Http::HEALTH_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { return http.health(request); }); route("/state.json", Http::STATE_HELP, - [http](const http::Request& request) { + [http](const process::http::Request& request) { Http::log(request); return http.state(request); }); http://git-wip-us.apache.org/repos/asf/mesos/blob/2b4fb835/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index ba3858f..62cf87d 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -92,8 +92,6 @@ namespace mesos { namespace internal { namespace tests { -namespace http = process::http; - // Those of the overall Mesos master/slave/scheduler/driver tests // that seem vaguely more master than slave-related are in this file. // The others are in "slave_tests.cpp". @@ -271,7 +269,8 @@ TEST_F(MasterTest, ShutdownFrameworkWhileTaskRunning) Clock::resume(); // Request master state. - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); AWAIT_READY(response); // These checks are not essential for the test, but may help @@ -1594,7 +1593,8 @@ TEST_F(MasterTest, SlavesEndpointWithoutSlaves) ASSERT_SOME(master); // Query the master. - Future<http::Response> response = http::get(master.get(), "slaves"); + Future<process::http::Response> response = + process::http::get(master.get(), "slaves"); AWAIT_READY(response); @@ -1642,7 +1642,8 @@ TEST_F(MasterTest, SlavesEndpointTwoSlaves) AWAIT_READY(slave2RegisteredMessage); // Query the master. - Future<http::Response> response = http::get(master.get(), "slaves"); + Future<process::http::Response> response = + process::http::get(master.get(), "slaves"); AWAIT_READY(response); @@ -2192,7 +2193,8 @@ TEST_F(MasterTest, OrphanTasks) EXPECT_EQ(TASK_RUNNING, status.get().state()); // Get the master's state. - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ( @@ -2257,7 +2259,7 @@ TEST_F(MasterTest, OrphanTasks) AWAIT_READY(reregisterFrameworkMessage); // Get the master's state. - response = http::get(master.get(), "state.json"); + response = process::http::get(master.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ( @@ -2289,7 +2291,7 @@ TEST_F(MasterTest, OrphanTasks) AWAIT_READY(frameworkRegisteredMessage); // Get the master's state. - response = http::get(master.get(), "state.json"); + response = process::http::get(master.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ( @@ -2755,9 +2757,10 @@ TEST_F(MasterTest, StateEndpoint) Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); - AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response); + AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response); EXPECT_SOME_EQ( "application/json", @@ -2903,10 +2906,10 @@ TEST_F(MasterTest, StateSummaryEndpoint) EXPECT_CALL(exec, shutdown(_)) .Times(AtMost(1)); - Future<http::Response> response = - http::get(master.get(), "state-summary"); + Future<process::http::Response> response = + process::http::get(master.get(), "state-summary"); - AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response); + AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response); EXPECT_SOME_EQ( "application/json", @@ -2960,8 +2963,9 @@ TEST_F(MasterTest, FrameworkWebUIUrl) AWAIT_READY(registered); - Future<http::Response> masterState = http::get(master.get(), "state.json"); - AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, masterState); + Future<process::http::Response> masterState = + process::http::get(master.get(), "state.json"); + AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, masterState); Try<JSON::Object> masterStateObject = JSON::parse<JSON::Object>(masterState.get().body); @@ -3070,7 +3074,8 @@ TEST_F(MasterTest, TaskLabels) AWAIT_READY(update); // Verify label key and value in master state.json. - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ( @@ -3147,7 +3152,8 @@ TEST_F(MasterTest, SlaveActiveEndpoint) AWAIT_READY(slaveRegisteredMessage); // Verify slave is active. - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); AWAIT_READY(response); Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body); @@ -3169,7 +3175,7 @@ TEST_F(MasterTest, SlaveActiveEndpoint) AWAIT_READY(deactivateSlave); // Verify slave is inactive. - response = http::get(master.get(), "state.json"); + response = process::http::get(master.get(), "state.json"); AWAIT_READY(response); parse = JSON::parse<JSON::Object>(response.get().body); @@ -3274,7 +3280,8 @@ TEST_F(MasterTest, TaskDiscoveryInfo) AWAIT_READY(update); // Verify label key and value in master state.json. - Future<http::Response> response = http::get(master.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(master.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ( http://git-wip-us.apache.org/repos/asf/mesos/blob/2b4fb835/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index 8dae6e0..8709874 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -88,8 +88,6 @@ namespace mesos { namespace internal { namespace tests { -namespace http = process::http; - // Those of the overall Mesos master/slave/scheduler/driver tests // that seem vaguely more slave than master-related are in this file. // The others are in "master_tests.cpp". @@ -946,9 +944,10 @@ TEST_F(SlaveTest, StateEndpoint) Try<PID<Slave>> slave = StartSlave(flags); ASSERT_SOME(slave); - Future<http::Response> response = http::get(slave.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(slave.get(), "state.json"); - AWAIT_EXPECT_RESPONSE_STATUS_EQ(http::OK().status, response); + AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response); EXPECT_SOME_EQ( "application/json", @@ -1915,7 +1914,8 @@ TEST_F(SlaveTest, TaskLabels) AWAIT_READY(update); // Verify label key and value in slave state.json. - Future<http::Response> response = http::get(slave.get(), "state.json"); + Future<process::http::Response> response = + process::http::get(slave.get(), "state.json"); AWAIT_READY(response); EXPECT_SOME_EQ(
