Merge 40310f5 into merged_master (Bitcoin PR bitcoin/bitcoin#21792)

Author: apoelstra

test/functional/p2p_segwit.py

@@ -2030,9 +2030,10 @@ def test_upgrade_after_activation(self):
         # Restarting node 2 should result in a shutdown because the blockchain consists of
         # insufficiently validated blocks per segwit consensus rules.
         self.stop_node(2)
-        with self.nodes[2].assert_debug_log(expected_msgs=[
-                f"Witness data for blocks after height {SEGWIT_HEIGHT} requires validation. Please restart with -reindex."], timeout=10):
-            self.nodes[2].start([f"-segwitheight={SEGWIT_HEIGHT}"])
+        self.nodes[2].assert_start_raises_init_error(
+            extra_args=[f"-segwitheight={SEGWIT_HEIGHT}"],
+            expected_msg=f": Witness data for blocks after height {SEGWIT_HEIGHT} requires validation. Please restart with -reindex..\nPlease restart with -reindex or -reindex-chainstate to recover.",
+        )
 
         # As directed, the user restarts the node with -reindex
         self.start_node(2, extra_args=["-reindex", f"-segwitheight={SEGWIT_HEIGHT}"])

test/functional/test_framework/test_node.py

@@ -505,6 +505,7 @@ def assert_start_raises_init_error(self, extra_args=None, expected_msg=None, mat
                 self.start(extra_args, stdout=log_stdout, stderr=log_stderr, *args, **kwargs)
                 ret = self.process.wait(timeout=self.rpc_timeout)
                 self.log.debug(self._node_msg(f'bitcoind exited with status {ret} during initialization'))
+                assert ret != 0  # Exit code must indicate failure
                 self.running = False
                 self.process = None
                 # Check stderr for expected message