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/03/03 07:39:32 UTC
mesos git commit: Fixed virtual function shadowing in appc provision
test.
Repository: mesos
Updated Branches:
refs/heads/master 4dc863ca9 -> 9bbba9402
Fixed virtual function shadowing in appc provision test.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9bbba940
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9bbba940
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9bbba940
Branch: refs/heads/master
Commit: 9bbba94021dde42c9d9d1fa0662462c364797018
Parents: 4dc863c
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Wed Mar 2 22:38:35 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Wed Mar 2 22:39:19 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/provisioner_appc_tests.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9bbba940/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index 86e1964..032c555 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -458,10 +458,10 @@ public:
void addRoute(const string& imageName)
{
- route("/" + imageName, None(), &TestAppcImageServer::serve);
+ route("/" + imageName, None(), &TestAppcImageServer::serveRequest);
}
- MOCK_METHOD1(serve, Future<http::Response>(const http::Request&));
+ MOCK_METHOD1(serveRequest, Future<http::Response>(const http::Request&));
};
@@ -584,7 +584,7 @@ TEST_F(AppcImageFetcherTest, SimpleFetch)
"2e797b296d6ab296e0954c2626bfb264322ebeb8f447dac4fac6511ea06bc61f0");
// Setup server.
- EXPECT_CALL(server, serve(_))
+ EXPECT_CALL(server, serveRequest(_))
.WillOnce(Return(serveImage()));
// Appc Image to be fetched.