diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 20:18:43 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 20:18:50 +0100 |
| commit | 2741b2b6f4688ee46caaa48b51c74a110320d50d (patch) | |
| tree | b582aab0a90bf23cd849b59c38550976b9b58a84 /test/functional/feature_pruning.py | |
| parent | 96d912bea82ae0960a193c93ece4739a4e0856e2 (diff) | |
| parent | 4999992c34a3b7acc86194924915e6216be5fe20 (diff) | |
| download | bitcoin-2741b2b6f4688ee46caaa48b51c74a110320d50d.tar.xz | |
Merge #15026: [test] Rename rpc_timewait to rpc_timeout
4999992c34 whitespace: Split ~300 char line into multiple ones (MarcoFalke)
fa71b38168 scripted-diff: Rename rpc_timewait to rpc_timeout (MarcoFalke)
fa3e5786d0 scripted-diff: Remove unused 'split' parameter to setup_network (MarcoFalke)
Pull request description:
This is a bugfix, since wallet_dump currently uses the wrong name:
https://github.com/bitcoin/bitcoin/blob/18857b4c4034af54e7ad3cbd78ff6f87f4f22567/test/functional/wallet_dump.py#L89-L92
Rename all to the same name with a scripted diff (and some unrelated cleanups).
Tree-SHA512: 338ddd20dae12e6cf7aa7adbcfb239cf648017a1572b373f8431fecb184bd2a65492846d81e75a023864d9e41c94afb53044c16b79651a5937d34a5a6b772f81
Diffstat (limited to 'test/functional/feature_pruning.py')
| -rwxr-xr-x | test/functional/feature_pruning.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index 11c6712881..9a3f4fae45 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -29,7 +29,7 @@ class PruneTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 6 - self.rpc_timewait = 900 + self.rpc_timeout = 900 # Create nodes 0 and 1 to mine. # Create node 2 to test pruning. |