Merge becea48fe0 into merged_master (Bitcoin PR bitcoin/bitcoin#25034)

test/functional/feature_coinstatsindex.py

@@ -234,11 +234,13 @@ class CoinStatsIndexTest(BitcoinTestFramework):
 
         self.log.info("Test that -reindex-chainstate is disallowed with coinstatsindex")
 
+        self.stop_node(1)
         self.nodes[1].assert_start_raises_init_error(
             expected_msg='Error: -reindex-chainstate option is not compatible with -coinstatsindex. '
             'Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.',
             extra_args=['-coinstatsindex', '-reindex-chainstate'],
         )
+        self.restart_node(1, extra_args=["-coinstatsindex"])
 
     def _test_use_index_option(self):
         self.log.info("Test use_index option for nodes running the index")

test/functional/feature_pruning.py

@@ -125,6 +125,7 @@ class PruneTest(BitcoinTestFramework):
         self.sync_blocks(self.nodes[0:5])
 
     def test_invalid_command_line_options(self):
+        self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(
             expected_msg='Error: Prune cannot be configured with a negative value.',
             extra_args=['-prune=-1'],

test/functional/test_framework/test_node.py

@@ -559,6 +559,7 @@ class TestNode():
 
         Will throw if bitcoind starts without an error.
         Will throw if an expected_msg is provided and it does not match bitcoind's stdout."""
+        assert not self.running
         with tempfile.NamedTemporaryFile(dir=self.stderr_dir, delete=False) as log_stderr, \
              tempfile.NamedTemporaryFile(dir=self.stdout_dir, delete=False) as log_stdout:
             try: