Increased session timeouts for ZooKeeper related tests. - On slower machines sometimes the zookeeper c client times out where we aren't expecting because either the test server or the client is too slow to respond. Increasing this value helps mitigate the problem.
Review: https://reviews.apache.org/r/25487 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fcb8dcb9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fcb8dcb9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fcb8dcb9 Branch: refs/heads/master Commit: fcb8dcb90b60528a41fb03ab769ca026e7da5d94 Parents: 60dd10c Author: Jiang Yan Xu <y...@jxu.me> Authored: Tue Sep 9 17:37:43 2014 -0700 Committer: Jiang Yan Xu <y...@jxu.me> Committed: Wed Sep 10 22:34:00 2014 -0700 ---------------------------------------------------------------------- src/tests/master_contender_detector_tests.cpp | 2 +- src/tests/zookeeper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fcb8dcb9/src/tests/master_contender_detector_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp index 9ac59aa..8f7fb18 100644 --- a/src/tests/master_contender_detector_tests.cpp +++ b/src/tests/master_contender_detector_tests.cpp @@ -490,7 +490,7 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderDetectorShutdownNetwork) TEST_F(ZooKeeperMasterContenderDetectorTest, MasterDetectorTimedoutSession) { // Use an arbitrary timeout value. - Duration sessionTimeout(Seconds(5)); + Duration sessionTimeout(Seconds(10)); Try<zookeeper::URL> url = zookeeper::URL::parse( "zk://" + server->connectString() + "/mesos"); http://git-wip-us.apache.org/repos/asf/mesos/blob/fcb8dcb9/src/tests/zookeeper.cpp ---------------------------------------------------------------------- diff --git a/src/tests/zookeeper.cpp b/src/tests/zookeeper.cpp index e45f956..08cab86 100644 --- a/src/tests/zookeeper.cpp +++ b/src/tests/zookeeper.cpp @@ -50,7 +50,7 @@ namespace mesos { namespace internal { namespace tests { -const Duration ZooKeeperTest::NO_TIMEOUT = Milliseconds(5000); +const Duration ZooKeeperTest::NO_TIMEOUT = Seconds(10); void ZooKeeperTest::SetUpTestCase()