From faca3734c00ffaf2be7bd555fbfa2887ba28c811 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 18 Oct 2020 10:13:07 +0200 Subject: [PATCH 1/2] test: Fix intermittent issue in wallet_import_rescan --- test/functional/wallet_import_rescan.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index 9d532742ee..f491a69d99 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -182,6 +182,7 @@ class ImportRescanTest(BitcoinTestFramework): self.nodes[0].generate(1) # Generate one block for each send variant.confirmation_height = self.nodes[0].getblockcount() variant.timestamp = self.nodes[0].getblockheader(self.nodes[0].getbestblockhash())["time"] + self.sync_all() # Conclude sync before calling setmocktime to avoid timeouts # Generate a block further in the future (past the rescan window). assert_equal(self.nodes[0].getrawmempool(), []) From faab86f6c8367178a068b298eda4ae3986ac2147 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 18 Oct 2020 11:04:32 +0200 Subject: [PATCH 2/2] test: Fix intermittent issue in wallet_send --- test/functional/wallet_send.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py index 876eb7f29e..60ab2d457e 100755 --- a/test/functional/wallet_send.py +++ b/test/functional/wallet_send.py @@ -316,6 +316,7 @@ class WalletSendTest(BitcoinTestFramework): res = self.nodes[0].sendrawtransaction(hex) self.nodes[0].generate(1) assert_equal(self.nodes[0].gettransaction(txid)["confirmations"], 1) + self.sync_all() self.log.info("Lock unspents...") utxo1 = w0.listunspent()[0]