Merge pull request #11621 from horizon-rust/fix/harness-reuse-finished-world

🤖 Agent: respawn_world_point and disconnect_crafting reuse generate/world only after a generate/finished marker, written after server.stop(); an old half-made world regenerates once.

tools/test_disconnect_crafting_parity.py

@@ -92,6 +92,7 @@ def generate(command, build):
             wait_new(server, start, ack)
     finally:
         server.stop()
+    (directory / 'finished').touch()
     return directory / 'world'
 
 
@@ -414,7 +415,8 @@ def main():
     net.PROPERTIES['force-gamemode'] = 'false'
     _, build, java, native, client = net.sides(args.build_name, args.binary.resolve() if args.binary else None)
     world = build / 'generate/world'
-    if not world.exists():
+    # A generate step that died leaves a world that must not be reused.
+    if not (build / 'generate/finished').exists():
         world = generate(java, build)
     reference = json.loads(args.reference.read_text()) if args.reference else None
     for side in (['java', 'native'] if args.side == 'both' else [args.side]):

tools/test_respawn_world_point_parity.py

@@ -71,6 +71,7 @@ def generate(command, build):
             console(server, cmd, ack)
     finally:
         server.stop()
+    (directory / 'finished').touch()
     return directory / 'world'
 
 
@@ -290,7 +291,8 @@ def main():
     _, build, java, native, client = net.sides(args.build_name, args.binary.resolve() if args.binary else None)
     (build / 'program.json').write_text(json.dumps(PROGRAM, indent=2, sort_keys=True) + '\n')
     world = build / 'generate/world'
-    if not world.exists():
+    # A generate step that died leaves a world that must not be reused.
+    if not (build / 'generate/finished').exists():
         world = generate(java, build)
     reference = args.reference
     for side in (['java', 'native'] if args.side == 'both' else [args.side]):