Added a mock method for `__run()` to the mock slave. Review: https://reviews.apache.org/r/65626/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a8e723b6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a8e723b6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a8e723b6 Branch: refs/heads/master Commit: a8e723b6ca5a268cc97e39919f7a6b4aedfc3222 Parents: a6c0650 Author: Meng Zhu <m...@mesosphere.io> Authored: Tue Feb 13 22:45:21 2018 -0800 Committer: Greg Mann <gregorywm...@gmail.com> Committed: Wed Feb 14 02:35:37 2018 -0800 ---------------------------------------------------------------------- src/slave/slave.hpp | 20 ++++++++++---------- src/tests/mock_slave.cpp | 22 ++++++++++++++++++++++ src/tests/mock_slave.hpp | 18 ++++++++++++++++++ 3 files changed, 50 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a8e723b6/src/slave/slave.hpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp index 9cd3597..42c3ebc 100644 --- a/src/slave/slave.hpp +++ b/src/slave/slave.hpp @@ -179,6 +179,16 @@ public: const std::vector<ResourceVersionUUID>& resourceVersionUuids, const Option<bool>& launchExecutor); + // Made 'virtual' for Slave mocking. + virtual void __run( + const process::Future<std::list<bool>>& future, + const FrameworkInfo& frameworkInfo, + const ExecutorInfo& executorInfo, + const Option<TaskInfo>& task, + const Option<TaskGroupInfo>& taskGroup, + const std::vector<ResourceVersionUUID>& resourceVersionUuids, + const Option<bool>& launchExecutor); + // This is called when the resource limits of the container have // been updated for the given tasks and task groups. If the update is // successful, we flush the given tasks to the executor by sending @@ -410,16 +420,6 @@ public: virtual void finalize(); virtual void exited(const process::UPID& pid); - void __run( - const process::Future<std::list<bool>>& future, - const FrameworkInfo& frameworkInfo, - const ExecutorInfo& executorInfo, - const Option<TaskInfo>& task, - const Option<TaskGroupInfo>& taskGroup, - const std::vector<ResourceVersionUUID>& resourceVersionUuids, - const Option<bool>& launchExecutor); - - process::Future<Secret> generateSecret( const FrameworkID& frameworkId, const ExecutorID& executorId, http://git-wip-us.apache.org/repos/asf/mesos/blob/a8e723b6/src/tests/mock_slave.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mock_slave.cpp b/src/tests/mock_slave.cpp index 9b06b9c..8ec55b6 100644 --- a/src/tests/mock_slave.cpp +++ b/src/tests/mock_slave.cpp @@ -130,6 +130,8 @@ MockSlave::MockSlave( .WillRepeatedly(Invoke(this, &MockSlave::unmocked_runTask)); EXPECT_CALL(*this, _run(_, _, _, _, _, _, _)) .WillRepeatedly(Invoke(this, &MockSlave::unmocked__run)); + EXPECT_CALL(*this, __run(_, _, _, _, _, _, _)) + .WillRepeatedly(Invoke(this, &MockSlave::unmocked___run)); EXPECT_CALL(*this, runTaskGroup(_, _, _, _, _, _)) .WillRepeatedly(Invoke(this, &MockSlave::unmocked_runTaskGroup)); EXPECT_CALL(*this, killTask(_, _)) @@ -209,6 +211,26 @@ void MockSlave::unmocked__run( } +void MockSlave::unmocked___run( + const Future<list<bool>>& future, + const FrameworkInfo& frameworkInfo, + const ExecutorInfo& executorInfo, + const Option<TaskInfo>& task, + const Option<TaskGroupInfo>& taskGroup, + const std::vector<ResourceVersionUUID>& resourceVersionUuids, + const Option<bool>& launchExecutor) +{ + slave::Slave::__run( + future, + frameworkInfo, + executorInfo, + task, + taskGroup, + resourceVersionUuids, + launchExecutor); +} + + void MockSlave::unmocked_runTaskGroup( const UPID& from, const FrameworkInfo& frameworkInfo, http://git-wip-us.apache.org/repos/asf/mesos/blob/a8e723b6/src/tests/mock_slave.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mock_slave.hpp b/src/tests/mock_slave.hpp index 9ed3e55..8ec2b65 100644 --- a/src/tests/mock_slave.hpp +++ b/src/tests/mock_slave.hpp @@ -153,6 +153,24 @@ public: const std::vector<ResourceVersionUUID>& resourceVersionUuids, const Option<bool>& launchExecutor); + MOCK_METHOD7(__run, void( + const process::Future<std::list<bool>>& future, + const FrameworkInfo& frameworkInfo, + const ExecutorInfo& executorInfo, + const Option<TaskInfo>& task, + const Option<TaskGroupInfo>& taskGroup, + const std::vector<ResourceVersionUUID>& resourceVersionUuids, + const Option<bool>& launchExecutor)); + + void unmocked___run( + const process::Future<std::list<bool>>& future, + const FrameworkInfo& frameworkInfo, + const ExecutorInfo& executorInfo, + const Option<TaskInfo>& task, + const Option<TaskGroupInfo>& taskGroup, + const std::vector<ResourceVersionUUID>& resourceVersionUuids, + const Option<bool>& launchExecutor); + MOCK_METHOD6(runTaskGroup, void( const process::UPID& from, const FrameworkInfo& frameworkInfo,