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 2013/06/24 21:05:38 UTC
git commit: Fixed flaky MasterDetectorExpireSlaveZKSessionNewMaster
test.
Updated Branches:
refs/heads/master dd25b2de9 -> 822892ebd
Fixed flaky MasterDetectorExpireSlaveZKSessionNewMaster test.
Review: https://reviews.apache.org/r/12065
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/822892eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/822892eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/822892eb
Branch: refs/heads/master
Commit: 822892ebd62e2fcc485be8148d8e01c8dfeb6447
Parents: dd25b2d
Author: Vinod Kone <vi...@twitter.com>
Authored: Mon Jun 24 11:36:50 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon Jun 24 12:04:39 2013 -0700
----------------------------------------------------------------------
src/tests/master_detector_tests.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/822892eb/src/tests/master_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_detector_tests.cpp b/src/tests/master_detector_tests.cpp
index 57f4e3e..2d140ba 100644
--- a/src/tests/master_detector_tests.cpp
+++ b/src/tests/master_detector_tests.cpp
@@ -612,7 +612,7 @@ TEST_F(ZooKeeperMasterDetectorTest, MasterDetectorExpireSlaveZKSessionNewMaster)
// Wait for session expiration and ensure we receive a
// NewMasterDetected message.
- AWAIT_READY(newMasterDetected4);
+ AWAIT_READY_FOR(newMasterDetected4, Seconds(10));
process::terminate(slave);
process::wait(slave);