git commit: Fixed the recovery timeout in the tests.

[bm...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master bb8375975 -> d94f08892


Fixed the recovery timeout in the tests.


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

Branch: refs/heads/master
Commit: d94f088923c9f455ba30eb74da4ec9dcbe430b68
Parents: bb83759
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Tue Jul 8 10:02:22 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Jul 8 10:02:22 2014 -0700

----------------------------------------------------------------------
 src/tests/cluster.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d94f0889/src/tests/cluster.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp
index 89aecf3..d857fc6 100644
--- a/src/tests/cluster.hpp
+++ b/src/tests/cluster.hpp
@@ -426,7 +426,9 @@ inline Try<process::PID<master::Master> > Cluster::Masters::start(
   // registration messages may be dropped, causing delayed retries.
   // NOTE: We use process::internal::await() to avoid awaiting a
   // Future forever when the Clock is paused.
-  if (!process::internal::await(_recover, Seconds(10))) {
+  if (!process::internal::await(
+          _recover,
+          flags.registry_fetch_timeout + flags.registry_store_timeout)) {
     LOG(FATAL) << "Failed to wait for _recover";
   }