Repository: mesos Updated Branches: refs/heads/master 8d74a9a30 -> b7bb6696b
Renamed MockAllocatorProcess to TestAllocatorProcess. Review: https://reviews.apache.org/r/29989 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ccd697df Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ccd697df Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ccd697df Branch: refs/heads/master Commit: ccd697df0b7e05b07dee75d53e0ff55d6884ba2f Parents: 8d74a9a Author: Benjamin Mahler <[email protected]> Authored: Fri Jan 16 12:13:01 2015 -0800 Committer: Benjamin Mahler <[email protected]> Committed: Wed Jan 28 15:36:11 2015 -0800 ---------------------------------------------------------------------- src/tests/master_allocator_tests.cpp | 8 ++++---- src/tests/mesos.hpp | 6 +++--- src/tests/resource_offers_tests.cpp | 2 +- src/tests/slave_recovery_tests.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ccd697df/src/tests/master_allocator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp index 2430622..ff025fa 100644 --- a/src/tests/master_allocator_tests.cpp +++ b/src/tests/master_allocator_tests.cpp @@ -80,7 +80,7 @@ protected: process::wait(allocator.real); } - MockAllocatorProcess<T> allocator; + TestAllocatorProcess<T> allocator; }; @@ -94,7 +94,7 @@ TYPED_TEST_CASE(MasterAllocatorTest, AllocatorTypes); // Checks that in a cluster with one slave and one framework, all of // the slave's resources are offered to the framework. -TYPED_TEST(MasterAllocatorTest, MockAllocator) +TYPED_TEST(MasterAllocatorTest, SingleFramework) { EXPECT_CALL(this->allocator, initialize(_, _, _)); @@ -1375,7 +1375,7 @@ TYPED_TEST(MasterAllocatorTest, FrameworkReregistersFirst) this->ShutdownMasters(); this->StopAllocator(); - MockAllocatorProcess<TypeParam> allocator2; + TestAllocatorProcess<TypeParam> allocator2; EXPECT_CALL(allocator2, initialize(_, _, _)); @@ -1500,7 +1500,7 @@ TYPED_TEST(MasterAllocatorTest, SlaveReregistersFirst) this->ShutdownMasters(); this->StopAllocator(); - MockAllocatorProcess<TypeParam> allocator2; + TestAllocatorProcess<TypeParam> allocator2; EXPECT_CALL(allocator2, initialize(_, _, _)); http://git-wip-us.apache.org/repos/asf/mesos/blob/ccd697df/src/tests/mesos.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index 3f4704b..6bb5a7f 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -675,10 +675,10 @@ public: template <typename T = master::allocator::AllocatorProcess> -class MockAllocatorProcess : public master::allocator::AllocatorProcess +class TestAllocatorProcess : public master::allocator::AllocatorProcess { public: - MockAllocatorProcess() + TestAllocatorProcess() { // Spawn the underlying allocator process. process::spawn(real); @@ -728,7 +728,7 @@ public: .WillByDefault(InvokeOffersRevived(this)); } - ~MockAllocatorProcess() + ~TestAllocatorProcess() { process::terminate(real); process::wait(real); http://git-wip-us.apache.org/repos/asf/mesos/blob/ccd697df/src/tests/resource_offers_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resource_offers_tests.cpp b/src/tests/resource_offers_tests.cpp index ffad1f8..ec86e3d 100644 --- a/src/tests/resource_offers_tests.cpp +++ b/src/tests/resource_offers_tests.cpp @@ -1324,7 +1324,7 @@ TEST_F(ResourceOffersTest, ResourcesGetReofferedAfterTaskInfoError) TEST_F(ResourceOffersTest, Request) { - MockAllocatorProcess<HierarchicalDRFAllocatorProcess> allocator; + TestAllocatorProcess<HierarchicalDRFAllocatorProcess> allocator; EXPECT_CALL(allocator, initialize(_, _, _)) .Times(1); http://git-wip-us.apache.org/repos/asf/mesos/blob/ccd697df/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index d135856..0b0f306 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -2255,7 +2255,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconcileShutdownFramework) // using an explicit executor. TYPED_TEST(SlaveRecoveryTest, ReconcileTasksMissingFromSlave) { - MockAllocatorProcess<master::allocator::HierarchicalDRFAllocatorProcess> + TestAllocatorProcess<master::allocator::HierarchicalDRFAllocatorProcess> allocator; EXPECT_CALL(allocator, initialize(_, _, _));
