You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/02/12 21:19:09 UTC

[4/6] mesos git commit: Removed unnecessary lifecycle method from MasterAllocatorTest.

Removed unnecessary lifecycle method from MasterAllocatorTest.

TestAllocator does not cause GMOCK warnings for unused method calls
any more. Hence there is no need for stopping allocation explicitly.

Review: https://reviews.apache.org/r/29927


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/be6246a1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/be6246a1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/be6246a1

Branch: refs/heads/master
Commit: be6246a11276074dfb60a892a890b80cb7cd37cd
Parents: 3093759
Author: Alexander Rukletsov <al...@mesosphere.io>
Authored: Thu Feb 12 11:44:16 2015 -0800
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Feb 12 11:44:16 2015 -0800

----------------------------------------------------------------------
 src/tests/master_allocator_tests.cpp | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/be6246a1/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 648a7a1..df9ac24 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -73,13 +73,6 @@ template <typename T>
 class MasterAllocatorTest : public MesosTest
 {
 protected:
-  void StopAllocator()
-  {
-    // TODO(alexr): Several tests have been reported flaky if no
-    // explicit stopping of allocation is used. Ensure allocation
-    // is stopped here.
-  }
-
   TestAllocator<T> allocator;
 };
 
@@ -1286,7 +1279,6 @@ TYPED_TEST(MasterAllocatorTest, FrameworkReregistersFirst)
     .WillRepeatedly(DoDefault());
 
   this->ShutdownMasters();
-  this->StopAllocator();
 
   TestAllocator<TypeParam> allocator2;
 
@@ -1399,7 +1391,6 @@ TYPED_TEST(MasterAllocatorTest, SlaveReregistersFirst)
     .WillRepeatedly(DoDefault());
 
   this->ShutdownMasters();
-  this->StopAllocator();
 
   TestAllocator<TypeParam> allocator2;