Skip to content

Commit 9e229a5

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26601: test: Move wallet tests to wallet_*.py
fa7d71a test: Move rpc_fundrawtransaction.py to wallet_fundrawtransaction.py (MarcoFalke) fa933d6 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 fa7d71a pablomartin4btc: re-ACK bitcoin/bitcoin@fa7d71a Tree-SHA512: 9dc131ed8ff119bd6d43d04ecc5c96d02f2d6fdc3d0805492774a414c0fbe6a984da7631154122a080c54ddd25fc5a5bdd52b282c918fce4932057ba72c2bf71
2 parents 16624e6 + fa7d71a commit 9e229a5

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

test/functional/test_framework/test_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def stop_node(self, expected_stderr='', *, wait=0, wait_until_stopped=True):
337337
return
338338
self.log.debug("Stopping node")
339339
try:
340-
# Do not use wait argument when testing older nodes, e.g. in feature_backwards_compatibility.py
340+
# Do not use wait argument when testing older nodes, e.g. in wallet_backwards_compatibility.py
341341
if self.version_is_at_least(180000):
342342
self.stop(wait=wait)
343343
else:

test/functional/test_runner.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
'mining_getblocktemplate_longpoll.py',
9999
'feature_maxuploadtarget.py',
100100
'feature_block.py',
101-
'rpc_fundrawtransaction.py --legacy-wallet',
102-
'rpc_fundrawtransaction.py --descriptors',
101+
'wallet_fundrawtransaction.py --legacy-wallet',
102+
'wallet_fundrawtransaction.py --descriptors',
103103
'p2p_compactblocks.py',
104104
'p2p_compactblocks_blocksonly.py',
105105
'feature_segwit.py --legacy-wallet',
@@ -226,8 +226,8 @@
226226
'wallet_txn_doublespend.py --legacy-wallet',
227227
'wallet_multisig_descriptor_psbt.py --descriptors',
228228
'wallet_txn_doublespend.py --descriptors',
229-
'feature_backwards_compatibility.py --legacy-wallet',
230-
'feature_backwards_compatibility.py --descriptors',
229+
'wallet_backwards_compatibility.py --legacy-wallet',
230+
'wallet_backwards_compatibility.py --descriptors',
231231
'wallet_txn_clone.py --mineblock',
232232
'feature_notifications.py',
233233
'rpc_getblockfilter.py',

test/functional/feature_backwards_compatibility.py renamed to test/functional/wallet_backwards_compatibility.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
Test various backwards compatibility scenarios. Requires previous releases binaries,
88
see test/README.md.
99
10-
v0.15.2 is not required by this test, but it is used in wallet_upgradewallet.py.
11-
Due to a hardfork in regtest, it can't be used to sync nodes.
12-
13-
1410
Due to RPC changes introduced in various versions the below tests
1511
won't work for older versions without some patches or workarounds.
1612

0 commit comments

Comments
 (0)