diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-09-13 18:18:17 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-13 18:18:24 +0200 |
| commit | 8df48b36ed3201d938b9974ecbee455d7dc2fb84 (patch) | |
| tree | eca67b640b550f9aac6c50e8570276329cf24463 | |
| parent | 96ac26e56627f0c24213fcd3a1cce9fc95f1f661 (diff) | |
| parent | fadd0c16b6bd62e9d663d906755320ae089e02d3 (diff) | |
Merge #11308: [qa] zapwallettxes: Wait up to 3s for mempool reload
fadd0c16b [qa] zapwallettxes: Wait up to 3s for mempool reload (MarcoFalke)
Pull request description:
There had been intermittent test failures on zapwallettxes, as no time was allotted to reload the mempool.
Tree-SHA512: 993254d2aaca6ea42fceefffed0cf90bdda91c64150179ef2a11337c3fe2cc6bf42b83ea9d9a1a575204fbde2676d7203443b00d053e8c2ed43e017c09d3ab11
| -rwxr-xr-x | test/functional/zapwallettxes.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/functional/zapwallettxes.py b/test/functional/zapwallettxes.py index c001517a6d..83b11035c8 100755 --- a/test/functional/zapwallettxes.py +++ b/test/functional/zapwallettxes.py @@ -15,9 +15,11 @@ been zapped. """ from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import (assert_equal, - assert_raises_jsonrpc, - ) +from test_framework.util import ( + assert_equal, + assert_raises_jsonrpc, + wait_until, +) class ZapWalletTXesTest (BitcoinTestFramework): def set_test_params(self): @@ -56,6 +58,8 @@ class ZapWalletTXesTest (BitcoinTestFramework): self.stop_node(0) self.start_node(0, ["-persistmempool=1", "-zapwallettxes=2"]) + wait_until(lambda: self.nodes[0].getmempoolinfo()['size'] == 1, timeout=3) + assert_equal(self.nodes[0].gettransaction(txid1)['txid'], txid1) assert_equal(self.nodes[0].gettransaction(txid2)['txid'], txid2) |