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 2015/09/15 00:30:07 UTC
[2/2] mesos git commit: Rebased Docker provisioner tests on SSL
utility changes.
Rebased Docker provisioner tests on SSL utility changes.
Review: https://reviews.apache.org/r/38308
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/89308f8e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/89308f8e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/89308f8e
Branch: refs/heads/master
Commit: 89308f8eaef491532dad752eb519d91c1d6f31cf
Parents: 435e411
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Mon Sep 14 18:13:28 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Sep 14 18:18:50 2015 -0400
----------------------------------------------------------------------
.../containerizer/docker_provisioner_tests.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/89308f8e/src/tests/containerizer/docker_provisioner_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_provisioner_tests.cpp b/src/tests/containerizer/docker_provisioner_tests.cpp
index 53f15e0..a3ccbc0 100644
--- a/src/tests/containerizer/docker_provisioner_tests.cpp
+++ b/src/tests/containerizer/docker_provisioner_tests.cpp
@@ -41,7 +41,12 @@ using std::string;
using std::vector;
using namespace mesos::internal::slave::docker::registry;
-using namespace process;
+
+using process::Clock;
+using process::Future;
+using process::Owned;
+
+using process::network::Socket;
using ManifestResponse = RegistryClient::ManifestResponse;
@@ -263,7 +268,7 @@ TEST_F(RegistryClientTest, SimpleGetToken)
Future<Socket> socket = server.get().accept();
// Create URL from server hostname and port.
- const http::URL url(
+ const process::http::URL url(
"https",
server.get().address().get().hostname().get(),
server.get().address().get().port);
@@ -330,7 +335,7 @@ TEST_F(RegistryClientTest, BadTokenResponse)
Future<Socket> socket = server.get().accept();
// Create URL from server hostname and port.
- const http::URL url(
+ const process::http::URL url(
"https",
server.get().address().get().hostname().get(),
server.get().address().get().port);
@@ -366,7 +371,7 @@ TEST_F(RegistryClientTest, BadTokenResponse)
TEST_F(RegistryClientTest, BadTokenServerAddress)
{
// Create an invalid URL with current time.
- const http::URL url("https", stringify(Clock::now().secs()), 0);
+ const process::http::URL url("https", stringify(Clock::now().secs()), 0);
Try<Owned<TokenManager>> tokenMgr = TokenManager::create(url);
ASSERT_SOME(tokenMgr);
@@ -395,7 +400,7 @@ TEST_F(RegistryClientTest, SimpleGetManifest)
Future<Socket> socket = server.get().accept();
- const http::URL url(
+ const process::http::URL url(
"https",
server.get().address().get().hostname().get(),
server.get().address().get().port);
@@ -524,7 +529,7 @@ TEST_F(RegistryClientTest, SimpleGetBlob)
Future<Socket> socket = server.get().accept();
- const http::URL url(
+ const process::http::URL url(
"https",
server.get().address().get().hostname().get(),
server.get().address().get().port);
@@ -634,7 +639,7 @@ TEST_F(RegistryClientTest, BadRequest)
Future<Socket> socket = server.get().accept();
- const http::URL url(
+ const process::http::URL url(
"https",
server.get().address().get().hostname().get(),
server.get().address().get().port);