Repository: mesos Updated Branches: refs/heads/master 1ea9497fa -> d57d9a6fd
Fixed flaky HTTPTest.NestedGet test. Review: https://reviews.apache.org/r/37487 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d57d9a6f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d57d9a6f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d57d9a6f Branch: refs/heads/master Commit: d57d9a6fd09246fce9b3b89b70fa6f0e37739f1f Parents: 1ea9497 Author: Vinod Kone <[email protected]> Authored: Fri Aug 14 10:20:33 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Fri Aug 14 10:40:59 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/src/tests/http_tests.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d57d9a6f/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 92f914f..c22f9d3 100644 --- a/3rdparty/libprocess/src/tests/http_tests.cpp +++ b/3rdparty/libprocess/src/tests/http_tests.cpp @@ -66,11 +66,8 @@ public: MOCK_METHOD1(get, Future<http::Response>(const http::Request&)); MOCK_METHOD1(post, Future<http::Response>(const http::Request&)); MOCK_METHOD1(requestDelete, Future<http::Response>(const http::Request&)); - - void addRoute(const string& path, const HttpRequestHandler& handler) - { - route(path, None(), handler); - } + MOCK_METHOD1(a, Future<http::Response>(const http::Request&)); + MOCK_METHOD1(abc, Future<http::Response>(const http::Request&)); protected: virtual void initialize() @@ -81,6 +78,8 @@ protected: route("/get", None(), &HttpProcess::get); route("/post", None(), &HttpProcess::post); route("/delete", None(), &HttpProcess::requestDelete); + route("/a", None(), &HttpProcess::a); + route("/a/b/c", None(), &HttpProcess::abc); } Future<http::Response> auth(const http::Request& request) @@ -446,13 +445,11 @@ TEST(HTTPTest, NestedGet) { Http http; - http.process->addRoute("/a/b/c", [] (const http::Request&) { - return http::OK(); - }); + EXPECT_CALL(*http.process, a(_)) + .WillOnce(Return(http::Accepted())); - http.process->addRoute("/a", [] (const http::Request&) { - return http::Accepted(); - }); + EXPECT_CALL(*http.process, abc(_)) + .WillOnce(Return(http::OK())); // The handler for "/a/b/c" should return 'http::OK()'. Future<http::Response> response = http::get(http.process->self(), "/a/b/c");
