You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/06/16 19:42:17 UTC

git commit: Enabling ZooKeeper tests that were previously disabled.

Repository: mesos
Updated Branches:
  refs/heads/master 2a216ec1c -> a8c8b8963


Enabling ZooKeeper tests that were previously disabled.

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


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

Branch: refs/heads/master
Commit: a8c8b89638bb9897ede7d36d3f5c02d9d79c7b46
Parents: 2a216ec
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Mon Jun 16 10:41:44 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon Jun 16 10:42:12 2014 -0700

----------------------------------------------------------------------
 src/tests/allocator_zookeeper_tests.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a8c8b896/src/tests/allocator_zookeeper_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/allocator_zookeeper_tests.cpp b/src/tests/allocator_zookeeper_tests.cpp
index b58d614..1f15cf5 100644
--- a/src/tests/allocator_zookeeper_tests.cpp
+++ b/src/tests/allocator_zookeeper_tests.cpp
@@ -66,8 +66,7 @@ TYPED_TEST_CASE(AllocatorZooKeeperTest, AllocatorTypes);
 // new master, if a framework reregisters before a slave that it has
 // resources on reregisters, all used and unused resources are
 // accounted for correctly.
-// DISABLED as per MESOS-1337 and MESOS-1341.
-TYPED_TEST(AllocatorZooKeeperTest, DISABLED_FrameworkReregistersFirst)
+TYPED_TEST(AllocatorZooKeeperTest, FrameworkReregistersFirst)
 {
   TypeParam allocator1;
 
@@ -182,8 +181,7 @@ TYPED_TEST(AllocatorZooKeeperTest, DISABLED_FrameworkReregistersFirst)
 // new master, if a slave reregisters before a framework that has
 // resources on reregisters, all used and unused resources are
 // accounted for correctly.
-// DISABLED as per MESOS-1436.
-TYPED_TEST(AllocatorZooKeeperTest, DISABLED_SlaveReregistersFirst)
+TYPED_TEST(AllocatorZooKeeperTest, SlaveReregistersFirst)
 {
   TypeParam allocator1;