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/24 23:19:08 UTC
[4/8] mesos git commit: Libprocess Reinit: Modified test to use
PID.
Libprocess Reinit: Modified test to use PID<MetricsProcess>.
Updates the test's reference to the global metrics singleton.
Review: https://reviews.apache.org/r/40411/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/757727cb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/757727cb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/757727cb
Branch: refs/heads/master
Commit: 757727cba114adcf73901406396e911ce7282bff
Parents: e705d5f
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Mon Oct 24 15:06:37 2016 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Oct 24 16:18:50 2016 -0700
----------------------------------------------------------------------
src/tests/scheduler_driver_tests.cpp | 4 +---
src/tests/scheduler_tests.cpp | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/757727cb/src/tests/scheduler_driver_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_driver_tests.cpp b/src/tests/scheduler_driver_tests.cpp
index faf2e6c..3705d13 100644
--- a/src/tests/scheduler_driver_tests.cpp
+++ b/src/tests/scheduler_driver_tests.cpp
@@ -62,8 +62,6 @@ using process::PID;
using process::http::OK;
-using process::metrics::internal::MetricsProcess;
-
using std::vector;
using testing::_;
@@ -96,7 +94,7 @@ TEST_F(MesosSchedulerDriverTest, MetricsEndpoint)
AWAIT_READY(registered);
Future<process::http::Response> response =
- process::http::get(MetricsProcess::instance()->self(), "snapshot");
+ process::http::get(process::metrics::internal::metrics, "snapshot");
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
http://git-wip-us.apache.org/repos/asf/mesos/blob/757727cb/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index abd1f61..6e876a7 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -75,8 +75,6 @@ using process::Queue;
using process::http::OK;
-using process::metrics::internal::MetricsProcess;
-
using std::cout;
using std::endl;
using std::string;
@@ -356,7 +354,7 @@ TEST_P(SchedulerTest, MetricsEndpoint)
AWAIT_READY(subscribed);
Future<process::http::Response> response =
- process::http::get(MetricsProcess::instance()->self(), "snapshot");
+ process::http::get(process::metrics::internal::metrics, "snapshot");
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);