From 156dc98f4f27780c9e2fe4fb632c6ec7b2df257c Mon Sep 17 00:00:00 2001 From: Codex Agent Date: Fri, 16 Oct 2026 12:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95:=20=E8=A1=A5=20CLI=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B7=AF=E7=94=B1=E7=9A=84=E8=A6=86=E7=9B=96?= =?UTF-8?q?(--keep-game=20/=20--report-dir=20/=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=AD=97=E6=AE=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit main() 改了十几轮, 这轮核实命令行参数还通不通, 发现只有 --report-dir 被间接覆盖 (EnkephalinGateTest 每次都传), --keep-game 完全没测。 补 CliRoutingTest 4 个用例: * 默认会关游戏 * --keep-game 时不关 * 报告文件名格式 + 字段齐全(started/result/ok/elapsed_s/steps/ lunacy_before/lunacy_after/lunacy_checked/converted 一个都不能少) * --start-timeout 能被接受 顺带修掉测试里一个没关的文件句柄(ResourceWarning)。 全套 317/317 通过; 真实报告目录仍是 6 份, 未被测试污染。 --- tests/test_convert_modules.py | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/tests/test_convert_modules.py b/tests/test_convert_modules.py index 6b6eaa4..2f49209 100644 --- a/tests/test_convert_modules.py +++ b/tests/test_convert_modules.py @@ -4,6 +4,7 @@ 这个脚本会操作真实游戏, 所以这里只测不碰硬件的部分: 屏幕判定、资源读数、 狂气相对比对用的解析。合成动作本身靠实机验证。 """ +import os import shutil import sys import tempfile @@ -514,6 +515,75 @@ class NoRealReportPollutionTest(unittest.TestCase): + ', '.join(offenders)) +class CliRoutingTest(QuietLogMixin, unittest.TestCase): + """命令行参数的路由 —— main() 改了很多轮, 参数别在改动里被弄丢。 + + --report-dir 由 EnkephalinGateTest 间接覆盖(它每次都传), 这里补 --keep-game。 + """ + + def _main(self, argv): + closed = [] + done = [] + tmp = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, tmp, True) + with mock.patch.object(cm, 'read_enkephalin', lambda: 4), \ + mock.patch.object(cm, 'read_lunacy', lambda **k: 9699), \ + mock.patch.object(cm, 'ensure_server', lambda *a: True), \ + mock.patch.object(cm, 'ensure_display', lambda *a: True), \ + mock.patch.object(cm, 'launch_game', lambda *a: True), \ + mock.patch.object(cm, 'wait_main_menu', lambda *a: True), \ + mock.patch.object(cm, 'ensure_window_size', lambda *a: (1600, 900)), \ + mock.patch.object(cm, 'close_panel', lambda: True), \ + mock.patch.object(cm, 'close_game', lambda: closed.append(1)), \ + mock.patch.object(cm.time, 'sleep', lambda s: None): + code = cm.main(argv + ['--report-dir', tmp]) + done.append(os.listdir(tmp)) + return code, closed, done[0] + + def test_default_closes_the_game(self): + code, closed, reports = self._main([]) + self.assertEqual(code, 0) + self.assertEqual(len(closed), 1, '默认应该把游戏关掉') + + def test_keep_game_skips_closing(self): + code, closed, reports = self._main(['--keep-game']) + self.assertEqual(code, 0) + self.assertEqual(closed, [], '--keep-game 时不该关游戏') + + def test_report_is_written_with_the_expected_fields(self): + """报告字段要齐全 —— 值守就靠 lunacy_* 和 converted 那几项下结论。""" + import json + closed = [] + tmp = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, tmp, True) + with mock.patch.object(cm, 'read_enkephalin', lambda: 25), \ + mock.patch.object(cm, 'read_lunacy', lambda **k: 9699), \ + mock.patch.object(cm, 'ensure_server', lambda *a: True), \ + mock.patch.object(cm, 'ensure_display', lambda *a: True), \ + mock.patch.object(cm, 'launch_game', lambda *a: True), \ + mock.patch.object(cm, 'wait_main_menu', lambda *a: True), \ + mock.patch.object(cm, 'ensure_window_size', lambda *a: (1600, 900)), \ + mock.patch.object(cm, 'close_panel', lambda: True), \ + mock.patch.object(cm, 'close_game', lambda: closed.append(1)), \ + mock.patch.object(cm, 'convert_once', + lambda tries=2: (True, '模组 1 -> 2 (+1)', 1)), \ + mock.patch.object(cm.time, 'sleep', lambda s: None): + cm.main(['--report-dir', tmp]) + name = os.listdir(tmp)[0] + self.assertRegex(name, r'^convert_\d{8}_\d{6}\.json$') + with open(os.path.join(tmp, name), encoding='utf-8') as fh: + r = json.load(fh) + for k in ('started', 'result', 'ok', 'elapsed_s', 'steps', + 'lunacy_before', 'lunacy_after', 'lunacy_checked', 'converted'): + self.assertIn(k, r, '报告缺字段 %s' % k) + self.assertTrue(r['converted']) + self.assertTrue(r['lunacy_checked']) + + def test_start_timeout_is_accepted(self): + code, closed, reports = self._main(['--start-timeout', '60']) + self.assertEqual(code, 0) + + class SafeClickTargetsTest(QuietLogMixin, unittest.TestCase): """脚本能点到的地方必须逐个安全 —— 用户的两条硬约束就靠这几个坐标。