diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-10-19 09:27:22 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-10-19 09:27:32 +0200 |
| commit | d9d9a293520d26ca8fec8caebab46db103b29903 (patch) | |
| tree | 493ad425e496ffd39b9f6a1496d46cd0d13a0ff3 | |
| parent | 152ddb31975875b8801043ea8342a7354357e282 (diff) | |
| parent | faab86f6c8367178a068b298eda4ae3986ac2147 (diff) | |
| download | bitcoin-d9d9a293520d26ca8fec8caebab46db103b29903.tar.xz | |
Merge #20179: test: Fix intermittent issue in wallet_import_rescan
faab86f6c8367178a068b298eda4ae3986ac2147 test: Fix intermittent issue in wallet_send (MarcoFalke)
faca3734c00ffaf2be7bd555fbfa2887ba28c811 test: Fix intermittent issue in wallet_import_rescan (MarcoFalke)
Pull request description:
Fixes the issue
```
node2 2020-10-16T14:26:28.699593Z (mocktime: 2020-10-16T16:26:46Z) [msghand] Timeout downloading block 1131f0318b913e078402524f1e63e53d52171844dd8246a03b970e540cb56924 from peer=0, disconnecting
ACKs for top commit:
fjahr:
utACK faab86f6c8367178a068b298eda4ae3986ac2147
Tree-SHA512: 739e8ad488c50e6beae676fb6cb021033cca6192da4acb4512c182bd8843f2f42a4a07474118285cb1d91798904433e4abb09476cc9ce115aae87ce64db69eaf
| -rwxr-xr-x | test/functional/wallet_import_rescan.py | 1 | ||||
| -rwxr-xr-x | test/functional/wallet_send.py | 1 |
2 files changed, 2 insertions, 0 deletions
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(), []) 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] |