mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From y..@apache.org
Subject git commit: Fixed MasterZooKeeperTest.LostZooKeeperCluster.
Date Fri, 29 Aug 2014 22:44:26 GMT
Repository: mesos
Updated Branches:
  refs/heads/master dece99c6c -> d0b375a8a


Fixed MasterZooKeeperTest.LostZooKeeperCluster.

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


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

Branch: refs/heads/master
Commit: d0b375a8a0e53a6374d49cf52f761a6ee909e266
Parents: dece99c
Author: Jiang Yan Xu <yan@jxu.me>
Authored: Fri Aug 29 10:57:04 2014 -0700
Committer: Jiang Yan Xu <yan@jxu.me>
Committed: Fri Aug 29 15:44:09 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/mesos/blob/d0b375a8/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 9de2424..eaa1675 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1770,6 +1770,10 @@ class MasterZooKeeperTest : public MesosZooKeeperTest {};
 TEST_F(MasterZooKeeperTest, LostZooKeeperCluster)
 {
   ASSERT_SOME(StartMaster());
+
+  Future<process::Message> slaveRegisteredMessage =
+    FUTURE_MESSAGE(Eq(SlaveRegisteredMessage().GetTypeName()), _, _);
+
   ASSERT_SOME(StartSlave());
 
   MockScheduler sched;
@@ -1784,8 +1788,6 @@ TEST_F(MasterZooKeeperTest, LostZooKeeperCluster)
 
   Future<process::Message> frameworkRegisteredMessage =
     FUTURE_MESSAGE(Eq(FrameworkRegisteredMessage().GetTypeName()), _, _);
-  Future<process::Message> slaveRegisteredMessage =
-    FUTURE_MESSAGE(Eq(SlaveRegisteredMessage().GetTypeName()), _, _);
 
   driver.start();
 


Mime
View raw message