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

@@ -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")