Reordered function declarations in `TestContainerizer`. The common pattern is to follow the order in the parent class.
Review: https://reviews.apache.org/r/44992/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d322aa95 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d322aa95 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d322aa95 Branch: refs/heads/master Commit: d322aa958cc141ff9df24aab825c77cec6405792 Parents: 4aba78e Author: Alexander Rukletsov <ruklet...@gmail.com> Authored: Thu Mar 24 17:30:06 2016 +0100 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Mar 24 18:21:01 2016 +0100 ---------------------------------------------------------------------- src/tests/containerizer.hpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d322aa95/src/tests/containerizer.hpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer.hpp b/src/tests/containerizer.hpp index 60ba9a7..efc1ca8 100644 --- a/src/tests/containerizer.hpp +++ b/src/tests/containerizer.hpp @@ -71,6 +71,12 @@ public: virtual ~TestContainerizer(); + virtual process::Future<hashset<ContainerID>> containers(); + + MOCK_METHOD1( + recover, + process::Future<Nothing>(const Option<slave::state::SlaveState>&)); + MOCK_METHOD7( launch, process::Future<bool>( @@ -92,16 +98,6 @@ public: const process::PID<slave::Slave>& slavePid, bool checkpoint); - // Additional destroy method for testing because we won't know the - // ContainerID created for each container. - void destroy(const FrameworkID& frameworkId, const ExecutorID& executorId); - - virtual process::Future<hashset<ContainerID> > containers(); - - MOCK_METHOD1( - recover, - process::Future<Nothing>(const Option<slave::state::SlaveState>&)); - MOCK_METHOD2( update, process::Future<Nothing>(const ContainerID&, const Resources&)); @@ -118,10 +114,14 @@ public: destroy, void(const ContainerID&)); + // Additional destroy method for testing because we won't know the + // ContainerID created for each container. + void destroy(const FrameworkID& frameworkId, const ExecutorID& executorId); + private: void setup(); - // Default 'launch' implementation. + // Default implementations of mock methods. process::Future<bool> _launch( const ContainerID& containerId, const ExecutorInfo& executorInfo,
