Auto merge of #1918 - bitcartel:timeout_cpu_throttling, r=str4d

Increase timeout as laptops on battery power have cpu throttling. Merge this last as other PRs also update the test file `wallet_protectcoinbase.py`.
2016-12-09 09:03:37 +00:00 · 2016-12-09 09:03:37 +00:00 · 02bb4df58d
parent 0617e428e2 f3c4919027
commit 02bb4df58d
1 changed files with 1 additions and 1 deletions
--- a/qa/rpc-tests/wallet_protectcoinbase.py
+++ b/qa/rpc-tests/wallet_protectcoinbase.py
@ -28,7 +28,7 @@ class WalletProtectCoinbaseTest (BitcoinTestFramework):
        print('waiting for async operation {}'.format(myopid))
        opids = []
        opids.append(myopid)
-        timeout = 120
+        timeout = 300
        status = None
        errormsg = None
        txid = None