diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2022-12-09 16:33:58 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2022-12-09 16:34:48 +0100 |
| commit | 9e229a542ff2107be43eff2e4b992841367f0366 (patch) | |
| tree | df6c11110b1dc47d491062fa922329664f57ec50 /test | |
| parent | 16624e6ff3af4429e571f7a606bbbcac336e067a (diff) | |
| parent | fa7d71acccab4e5b416c9dd1e2080a9652107f84 (diff) | |
| download | bitcoin-9e229a542ff2107be43eff2e4b992841367f0366.tar.xz | |
Merge bitcoin/bitcoin#26601: test: Move wallet tests to wallet_*.py
fa7d71acccab4e5b416c9dd1e2080a9652107f84 test: Move rpc_fundrawtransaction.py to wallet_fundrawtransaction.py (MarcoFalke)
fa933d6985830382c7e2da740bc363bf6a52c4ae test: Move feature_backwards_compatibility.py to wallet_backwards_compatibility.py (MarcoFalke)
Pull request description:
The tests only tests the wallet and it doesn't make sense to extend it for other stuff, so clarify that.
ACKs for top commit:
fanquake:
ACK fa7d71acccab4e5b416c9dd1e2080a9652107f84
pablomartin4btc:
re-ACK https://github.com/bitcoin/bitcoin/commit/fa7d71acccab4e5b416c9dd1e2080a9652107f84
Tree-SHA512: 9dc131ed8ff119bd6d43d04ecc5c96d02f2d6fdc3d0805492774a414c0fbe6a984da7631154122a080c54ddd25fc5a5bdd52b282c918fce4932057ba72c2bf71
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/test_framework/test_node.py | 2 | ||||
| -rwxr-xr-x | test/functional/test_runner.py | 8 | ||||
| -rwxr-xr-x | test/functional/wallet_backwards_compatibility.py (renamed from test/functional/feature_backwards_compatibility.py) | 4 | ||||
| -rwxr-xr-x | test/functional/wallet_fundrawtransaction.py (renamed from test/functional/rpc_fundrawtransaction.py) | 0 |
4 files changed, 5 insertions, 9 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index fc93940b63..2d3b105fa2 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -337,7 +337,7 @@ class TestNode(): return self.log.debug("Stopping node") try: - # Do not use wait argument when testing older nodes, e.g. in feature_backwards_compatibility.py + # Do not use wait argument when testing older nodes, e.g. in wallet_backwards_compatibility.py if self.version_is_at_least(180000): self.stop(wait=wait) else: diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index b9adb5dcb5..31b308546d 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -98,8 +98,8 @@ BASE_SCRIPTS = [ 'mining_getblocktemplate_longpoll.py', 'feature_maxuploadtarget.py', 'feature_block.py', - 'rpc_fundrawtransaction.py --legacy-wallet', - 'rpc_fundrawtransaction.py --descriptors', + 'wallet_fundrawtransaction.py --legacy-wallet', + 'wallet_fundrawtransaction.py --descriptors', 'p2p_compactblocks.py', 'p2p_compactblocks_blocksonly.py', 'feature_segwit.py --legacy-wallet', @@ -226,8 +226,8 @@ BASE_SCRIPTS = [ 'wallet_txn_doublespend.py --legacy-wallet', 'wallet_multisig_descriptor_psbt.py --descriptors', 'wallet_txn_doublespend.py --descriptors', - 'feature_backwards_compatibility.py --legacy-wallet', - 'feature_backwards_compatibility.py --descriptors', + 'wallet_backwards_compatibility.py --legacy-wallet', + 'wallet_backwards_compatibility.py --descriptors', 'wallet_txn_clone.py --mineblock', 'feature_notifications.py', 'rpc_getblockfilter.py', diff --git a/test/functional/feature_backwards_compatibility.py b/test/functional/wallet_backwards_compatibility.py index c1855b9da4..c9cb3285fb 100755 --- a/test/functional/feature_backwards_compatibility.py +++ b/test/functional/wallet_backwards_compatibility.py @@ -7,10 +7,6 @@ Test various backwards compatibility scenarios. Requires previous releases binaries, see test/README.md. -v0.15.2 is not required by this test, but it is used in wallet_upgradewallet.py. -Due to a hardfork in regtest, it can't be used to sync nodes. - - Due to RPC changes introduced in various versions the below tests won't work for older versions without some patches or workarounds. diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/wallet_fundrawtransaction.py index bf218bfee9..bf218bfee9 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/wallet_fundrawtransaction.py |