diff options
| author | Seleme Topuz <[email protected]> | 2020-08-17 17:50:47 +0200 |
|---|---|---|
| committer | Seleme Topuz <[email protected]> | 2020-08-26 18:01:59 +0200 |
| commit | 1343c86c7cc1fc896696b3ed87c12039e4ef3a0c (patch) | |
| tree | 0e98164b74d0549a90de162226c36b677b7e8846 /test/functional/feature_pruning.py | |
| parent | Merge bitcoin-core/gui#35: Parse params directly instead of through node (par... (diff) | |
| download | discoin-1343c86c7cc1fc896696b3ed87c12039e4ef3a0c.tar.xz discoin-1343c86c7cc1fc896696b3ed87c12039e4ef3a0c.zip | |
test: Update wait_until usage in tests not to use the one from utils
Replace "wait_until()" usage from utils, with the ones from BitcoinTestFramework and P2PInterface.
closes #19080
Diffstat (limited to 'test/functional/feature_pruning.py')
| -rwxr-xr-x | test/functional/feature_pruning.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index 02fa88f7c..db408ab67 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -20,7 +20,6 @@ from test_framework.util import ( assert_raises_rpc_error, connect_nodes, disconnect_nodes, - wait_until, ) # Rescans start at the earliest block up to 2 hours before a key timestamp, so @@ -136,7 +135,7 @@ class PruneTest(BitcoinTestFramework): mine_large_blocks(self.nodes[0], 25) # Wait for blk00000.dat to be pruned - wait_until(lambda: not os.path.isfile(os.path.join(self.prunedir, "blk00000.dat")), timeout=30) + self.wait_until(lambda: not os.path.isfile(os.path.join(self.prunedir, "blk00000.dat")), timeout=30) self.log.info("Success") usage = calc_usage(self.prunedir) @@ -250,7 +249,7 @@ class PruneTest(BitcoinTestFramework): self.log.info("Verify node 2 reorged back to the main chain, some blocks of which it had to redownload") # Wait for Node 2 to reorg to proper height - wait_until(lambda: self.nodes[2].getblockcount() >= goalbestheight, timeout=900) + self.wait_until(lambda: self.nodes[2].getblockcount() >= goalbestheight, timeout=900) assert_equal(self.nodes[2].getbestblockhash(), goalbesthash) # Verify we can now have the data for a block previously pruned assert_equal(self.nodes[2].getblock(self.forkhash)["height"], self.forkheight) |