Repository: mesos Updated Branches: refs/heads/master 2158f3d86 -> 3f3a3bd7b
Fixed build error for HTTPCommandExecutorTest.TerminateWithACK. Review: https://reviews.apache.org/r/52186/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3f3a3bd7 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3f3a3bd7 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3f3a3bd7 Branch: refs/heads/master Commit: 3f3a3bd7b1e8dbd3cca2f672a4a966ca0224fe3e Parents: 2158f3d Author: Guangya Liu <gyliu...@gmail.com> Authored: Thu Sep 22 19:42:23 2016 -0700 Committer: Joseph Wu <josep...@apache.org> Committed: Thu Sep 22 19:42:23 2016 -0700 ---------------------------------------------------------------------- src/tests/command_executor_tests.cpp | 4 ++-- src/tests/mock_slave.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3f3a3bd7/src/tests/command_executor_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/command_executor_tests.cpp b/src/tests/command_executor_tests.cpp index 2bc4667..beb3cbc 100644 --- a/src/tests/command_executor_tests.cpp +++ b/src/tests/command_executor_tests.cpp @@ -270,7 +270,7 @@ TEST_F(HTTPCommandExecutorTest, TerminateWithACK) .WillOnce(FutureArg<1>(&statusRunning)) .WillOnce(FutureArg<1>(&statusFinished)); - Future<Future<ContainerTermination>> termination; + Future<Future<Option<ContainerTermination>>> termination; EXPECT_CALL(slave, executorTerminated(_, _, _)) .WillOnce(FutureArg<2>(&termination)); @@ -287,7 +287,7 @@ TEST_F(HTTPCommandExecutorTest, TerminateWithACK) // it gets the ACK for the terminal status update from agent. AWAIT_READY(termination); ASSERT_TRUE(termination.get().isReady()); - EXPECT_EQ(0, termination.get().get().status()); + EXPECT_EQ(0, termination.get().get().get().status()); driver.stop(); driver.join(); http://git-wip-us.apache.org/repos/asf/mesos/blob/3f3a3bd7/src/tests/mock_slave.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mock_slave.hpp b/src/tests/mock_slave.hpp index 39e836b..1acb961 100644 --- a/src/tests/mock_slave.hpp +++ b/src/tests/mock_slave.hpp @@ -187,7 +187,8 @@ public: MOCK_METHOD3(executorTerminated, void( const FrameworkID& frameworkId, const ExecutorID& executorId, - const process::Future<mesos::slave::ContainerTermination>& termination)); + const process::Future<Option< + mesos::slave::ContainerTermination>>& termination)); private: Files files;
