Skip to content

Commit

Permalink
Auto merge of zcash#1918 - bitcartel:timeout_cpu_throttling, r=str4d
Browse files Browse the repository at this point in the history
Increase timeout as laptops on battery power have cpu throttling.

Merge this last as other PRs also update the test file `wallet_protectcoinbase.py`.
  • Loading branch information
zkbot committed Dec 9, 2016
2 parents 0617e42 + f3c4919 commit 02bb4df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion qa/rpc-tests/wallet_protectcoinbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def wait_and_assert_operationid_status(self, myopid, in_status='success', in_err
print('waiting for async operation {}'.format(myopid))
opids = []
opids.append(myopid)
timeout = 120
timeout = 300
status = None
errormsg = None
txid = None
Expand Down

0 comments on commit 02bb4df

Please sign in to comment.