From fa53305d767e76408893d6ee8549137e389c8c73 Mon Sep 17 00:00:00 2001 From: chen21019 Date: Fri, 30 Oct 2026 02:16:38 +0800 Subject: [PATCH] Keep publisher collision fixture aligned with image Java defaults --- scripts/test-publisher-safety-guards.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/test-publisher-safety-guards.py b/scripts/test-publisher-safety-guards.py index 181dd72f26..839cd2f899 100644 --- a/scripts/test-publisher-safety-guards.py +++ b/scripts/test-publisher-safety-guards.py @@ -117,6 +117,9 @@ def test_collision_never_arms_cleanup_or_removes_existing_objects(self): if [[ "$2" == "$collision" ]]; then return 0; else return 1; fi fi printf '%s\\n' "$*" >>"$evidence/commands" + if [[ "$1 $2" == 'image inspect' ]]; then + printf '%s\\n' 'JAVA_OPTS=--add-opens=java.base/java.lang=ALL-UNNAMED' + fi } ''' + block result = subprocess.run(['bash', '-c', script, 'guard-test', temporary, collision], @@ -129,8 +132,12 @@ def test_collision_never_arms_cleanup_or_removes_existing_objects(self): else: self.assertEqual(result.returncode, 0, result.stderr) calls = commands.read_text().splitlines() - self.assertTrue(calls[0].startswith('run -d --name candidate ')) - self.assertEqual(calls[1:], ['rm -f candidate', 'volume rm cattle mysql mysqllog']) + self.assertTrue(calls[0].startswith('image inspect image --format ')) + self.assertTrue(calls[1].startswith('run -d --name candidate ')) + self.assertIn('JAVA_OPTS=--add-opens=java.base/java.lang=ALL-UNNAMED ' + '-Dapi.ai.bridge.enabled=true -Dapi.ai.service.upgrade.enabled=true ' + '-Dapi.ai.resource.change.enabled=true', calls[1]) + self.assertEqual(calls[2:], ['rm -f candidate', 'volume rm cattle mysql mysqllog']) if __name__ == '__main__':