Skip to content

Commit

Permalink
test: Bump timeout in wallet_import_rescan
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoFalke committed Apr 17, 2020
1 parent c54295c commit fabfcad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 1 addition & 2 deletions test/functional/test_framework/test_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def wait_for_rpc_connection(self):
if "No RPC credentials" not in str(e):
raise
time.sleep(1.0 / poll_per_s)
self._raise_assertion_error("Unable to connect to bitcoind")
self._raise_assertion_error("Unable to connect to bitcoind after {}s".format(self.rpc_timeout))

def generate(self, nblocks, maxtries=1000000):
self.log.debug("TestNode.generate() dispatches `generate` call to `generatetoaddress`")
Expand Down Expand Up @@ -527,7 +527,6 @@ def arg_to_cli(arg):

class TestNodeCLI():
"""Interface to bitcoin-cli for an individual node"""

def __init__(self, binary, datadir):
self.options = []
self.binary = binary
Expand Down
3 changes: 2 additions & 1 deletion test/functional/wallet_import_rescan.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

class Variant(collections.namedtuple("Variant", "call data address_type rescan prune")):
"""Helper for importing one key and verifying scanned transactions."""

def do_import(self, timestamp):
"""Call one key import RPC."""
rescan = self.rescan == Rescan.yes
Expand Down Expand Up @@ -146,6 +145,7 @@ class ImportRescanTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 2 + len(IMPORT_NODES)
self.supports_cli = False
self.rpc_timeout = 120

def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
Expand Down Expand Up @@ -226,5 +226,6 @@ def run_test(self):
variant.expected_txs += 1
variant.check(variant.sent_txid, variant.sent_amount, variant.confirmation_height)


if __name__ == "__main__":
ImportRescanTest().main()

0 comments on commit fabfcad

Please sign in to comment.