File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -241,7 +241,7 @@ def wait_for_rpc_connection(self):
241
241
if "No RPC credentials" not in str (e ):
242
242
raise
243
243
time .sleep (1.0 / poll_per_s )
244
- self ._raise_assertion_error ("Unable to connect to bitcoind" )
244
+ self ._raise_assertion_error ("Unable to connect to bitcoind after {}s" . format ( self . rpc_timeout ) )
245
245
246
246
def generate (self , nblocks , maxtries = 1000000 ):
247
247
self .log .debug ("TestNode.generate() dispatches `generate` call to `generatetoaddress`" )
@@ -527,7 +527,6 @@ def arg_to_cli(arg):
527
527
528
528
class TestNodeCLI ():
529
529
"""Interface to bitcoin-cli for an individual node"""
530
-
531
530
def __init__ (self , binary , datadir ):
532
531
self .options = []
533
532
self .binary = binary
Original file line number Diff line number Diff line change 40
40
41
41
class Variant (collections .namedtuple ("Variant" , "call data address_type rescan prune" )):
42
42
"""Helper for importing one key and verifying scanned transactions."""
43
-
44
43
def do_import (self , timestamp ):
45
44
"""Call one key import RPC."""
46
45
rescan = self .rescan == Rescan .yes
@@ -146,6 +145,7 @@ class ImportRescanTest(BitcoinTestFramework):
146
145
def set_test_params (self ):
147
146
self .num_nodes = 2 + len (IMPORT_NODES )
148
147
self .supports_cli = False
148
+ self .rpc_timeout = 120
149
149
150
150
def skip_test_if_missing_module (self ):
151
151
self .skip_if_no_wallet ()
@@ -226,5 +226,6 @@ def run_test(self):
226
226
variant .expected_txs += 1
227
227
variant .check (variant .sent_txid , variant .sent_amount , variant .confirmation_height )
228
228
229
+
229
230
if __name__ == "__main__" :
230
231
ImportRescanTest ().main ()
You can’t perform that action at this time.
0 commit comments