diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-04-23 09:43:10 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-23 09:43:15 -0400 |
commit | caceff55465e392dfd1b0ba9225653b64d8518f1 (patch) | |
tree | d9ab5b06e60d4c64012bab90d77fd78bd82cf13a /test/functional | |
parent | 08bd21a3bda9f621948c535e951880d7e318caa5 (diff) | |
parent | fa465e4da4c7242d7edd6339747572d23a39ff98 (diff) | |
download | bitcoin-caceff55465e392dfd1b0ba9225653b64d8518f1.tar.xz |
Merge #15866: test: Add missing syncwithvalidationinterfacequeue to wallet_import_rescan
fa465e4da4 test: Add missing syncwithvalidationinterfacequeue to wallet_import_rescan (MarcoFalke)
Pull request description:
Fixes #15865
ACKs for commit fa465e:
promag:
utACK fa465e4da4c7242d7edd6339747572d23a39ff98.
Tree-SHA512: efc1d82b92aefb1f0e6c54ed0a2d69c547cd9dee7ff8d57a665022fefce01bcf726d394f0665abe4fbd3451abf3cb08eed6ff45def831857f917a988e13a1055
Diffstat (limited to 'test/functional')
-rwxr-xr-x | test/functional/wallet_import_rescan.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index 72df714d80..9de30d0374 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -166,11 +166,12 @@ class ImportRescanTest(BitcoinTestFramework): timestamp = self.nodes[0].getblockheader(self.nodes[0].getbestblockhash())["time"] set_node_times(self.nodes, timestamp + TIMESTAMP_WINDOW + 1) self.nodes[0].generate(1) - self.sync_blocks() + self.sync_all() # For each variation of wallet key import, invoke the import RPC and # check the results from getbalance and listtransactions. for variant in IMPORT_VARIANTS: + self.log.info('Run import for variant {}'.format(variant)) variant.expect_disabled = variant.rescan == Rescan.yes and variant.prune and variant.call == Call.single expect_rescan = variant.rescan == Rescan.yes and not variant.expect_disabled variant.node = self.nodes[2 + IMPORT_NODES.index(ImportNode(variant.prune, expect_rescan))] @@ -192,10 +193,11 @@ class ImportRescanTest(BitcoinTestFramework): # Generate a block containing the new transactions. self.nodes[0].generate(1) assert_equal(self.nodes[0].getrawmempool(), []) - self.sync_blocks() + self.sync_all() # Check the latest results from getbalance and listtransactions. for variant in IMPORT_VARIANTS: + self.log.info('Run check for variant {}'.format(variant)) if not variant.expect_disabled: variant.expected_balance += variant.sent_amount variant.expected_txs += 1 |