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 2015/11/12 15:19:23 UTC
mesos git commit: Updated HTTP pipelining test so that two Processes
are involved.
Repository: mesos
Updated Branches:
refs/heads/master 2621de57c -> 78f32d555
Updated HTTP pipelining test so that two Processes are involved.
Review: https://reviews.apache.org/r/40230
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/78f32d55
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/78f32d55
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/78f32d55
Branch: refs/heads/master
Commit: 78f32d555fd4e50b0a9f5e046140e4e21276ecc0
Parents: 2621de5
Author: Alexander Rojas <al...@mesosphere.io>
Authored: Thu Nov 12 15:15:35 2015 +0100
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Thu Nov 12 15:18:47 2015 +0100
----------------------------------------------------------------------
3rdparty/libprocess/src/tests/http_tests.cpp | 35 +++++++++++++++--------
1 file changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/78f32d55/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 7eb4ef1..5e70f18 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -739,15 +739,24 @@ TEST(HTTPConnectionTest, Serial)
TEST(HTTPConnectionTest, Pipeline)
{
- Http http;
+ // We use two Processes here to ensure that libprocess performs
+ // pipelining correctly when requests on a single connection
+ // are going to different Processes.
+ Http http1, http2;
- http::URL url = http::URL(
+ http::URL url1 = http::URL(
"http",
- http.process->self().address.ip,
- http.process->self().address.port,
- http.process->self().id + "/get");
+ http1.process->self().address.ip,
+ http1.process->self().address.port,
+ http1.process->self().id + "/get");
- Future<http::Connection> connect = http::connect(url);
+ http::URL url2 = http::URL(
+ "http",
+ http2.process->self().address.ip,
+ http2.process->self().address.port,
+ http2.process->self().id + "/get");
+
+ Future<http::Connection> connect = http::connect(url1);
AWAIT_READY(connect);
http::Connection connection = connect.get();
@@ -756,23 +765,25 @@ TEST(HTTPConnectionTest, Pipeline)
Promise<http::Response> promise1, promise2, promise3;
Future<http::Request> get1, get2, get3;
- EXPECT_CALL(*http.process, get(_))
+ EXPECT_CALL(*http1.process, get(_))
.WillOnce(DoAll(FutureArg<0>(&get1),
Return(promise1.future())))
- .WillOnce(DoAll(FutureArg<0>(&get2),
- Return(promise2.future())))
.WillOnce(DoAll(FutureArg<0>(&get3),
Return(promise3.future())));
+ EXPECT_CALL(*http2.process, get(_))
+ .WillOnce(DoAll(FutureArg<0>(&get2),
+ Return(promise2.future())));
+
http::Request request1, request2, request3;
request1.method = "GET";
request2.method = "GET";
request3.method = "GET";
- request1.url = url;
- request2.url = url;
- request3.url = url;
+ request1.url = url1;
+ request2.url = url2;
+ request3.url = url1;
request1.body = "1";
request2.body = "2";