diff options
author | John Newbery <john@johnnewbery.com> | 2017-06-09 18:21:21 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-10-03 18:43:43 +0200 |
commit | 801d2ae9247be5870344c8b4ed5c372ab8930408 (patch) | |
tree | 2326b26745fcdb556b9a937b5e8fe116fd21a9ae /test/functional/wallet.py | |
parent | bb5e7cb308b58a1c16db1275dfca1a31e2bba71f (diff) | |
download | bitcoin-801d2ae9247be5870344c8b4ed5c372ab8930408.tar.xz |
[tests] don't override __init__() in individual tests
Almost all test scripts currently need to override the __init__()
method. When they do that they need to call into super().__init__() as
the base class does some generic initialization.
This commit makes the base class __init__() call into set_test_params()
method. Individual test cases can override set_test_params() to setup
their test parameters.
Github-Pull: #11121
Rebased-From: 5448a1471d6fc638a2220ea5a2f3782172efe14c
Diffstat (limited to 'test/functional/wallet.py')
-rwxr-xr-x | test/functional/wallet.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/test/functional/wallet.py b/test/functional/wallet.py index 7190de94b6..79727f9be6 100755 --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -7,17 +7,8 @@ from test_framework.test_framework import BitcoinTestFramework from test_framework.util import * class WalletTest(BitcoinTestFramework): - - def check_fee_amount(self, curr_balance, balance_with_fee, fee_per_byte, tx_size): - """Return curr_balance after asserting the fee was in range""" - fee = balance_with_fee - curr_balance - assert_fee_amount(fee, tx_size, fee_per_byte * 1000) - return curr_balance - - def __init__(self): - super().__init__() + def set_test_params(self): self.setup_clean_chain = True - self.num_nodes = 4 self.extra_args = [['-usehd={:d}'.format(i%2==0)] for i in range(4)] def setup_network(self): @@ -30,8 +21,13 @@ class WalletTest(BitcoinTestFramework): connect_nodes_bi(self.nodes,0,2) self.sync_all([self.nodes[0:3]]) - def run_test(self): + def check_fee_amount(self, curr_balance, balance_with_fee, fee_per_byte, tx_size): + """Return curr_balance after asserting the fee was in range""" + fee = balance_with_fee - curr_balance + assert_fee_amount(fee, tx_size, fee_per_byte * 1000) + return curr_balance + def run_test(self): # Check that there's no UTXO on none of the nodes assert_equal(len(self.nodes[0].listunspent()), 0) assert_equal(len(self.nodes[1].listunspent()), 0) |