From 6112df3a90d392d4315cdc887b6f08ce3f93da1f Mon Sep 17 00:00:00 2001
From: cornwarecjp <cornwarecjp@ultimatestunts.nl>
Date: Thu, 1 Feb 2018 21:43:39 +0100
Subject: [PATCH] Bring back the time-out on the start-up of bitcoind, but make
 it 60 seconds instead of the original 10 seconds. This is much larger than
 the normal start-up time of bitcoind (so we should never hit the time-out),
 but still lets a test terminate in a reasonable time in the unlikely case
 that bitcoind hangs.

---
 tests/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils.py b/tests/utils.py
index 54c1d2f8f..7b9c437c0 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -226,7 +226,7 @@ class BitcoinD(TailableProc):
 
     def start(self):
         TailableProc.start(self)
-        self.wait_for_log("Done loading", timeout=None)
+        self.wait_for_log("Done loading", timeout=60)
 
         logging.info("BitcoinD started")