修复运行日志复核发现的任务控制与结果误判
This commit is contained in:
+126
-11
@@ -1,5 +1,7 @@
|
||||
from pathlib import Path
|
||||
import json
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
@@ -54,6 +56,7 @@ class RunAalcTest(unittest.TestCase):
|
||||
|
||||
def run_aalc(self, mcp, **kw):
|
||||
with mock.patch.object(auto_cycle, 'probe', mcp.probe), \
|
||||
mock.patch.object(auto_cycle, 'blocking_module_modal', return_value=None), \
|
||||
mock.patch.object(auto_cycle, 'log', lambda m: None):
|
||||
return auto_cycle.run_aalc('daily', {}, 3600, sleep=lambda s: None, **kw)
|
||||
|
||||
@@ -62,9 +65,12 @@ class RunAalcTest(unittest.TestCase):
|
||||
clock = FakeTime(step)
|
||||
patches = [mock.patch.object(auto_cycle, 'probe', mcp.probe),
|
||||
mock.patch.object(auto_cycle, 'log', lambda m: None),
|
||||
mock.patch.object(auto_cycle.time, 'time', clock.time)]
|
||||
mock.patch.object(auto_cycle.time, 'time', clock.time),
|
||||
mock.patch.object(auto_cycle, 'clear_blocking_modal', return_value='已发送 Cancel')]
|
||||
if clear is not None:
|
||||
patches.append(mock.patch.object(auto_cycle, 'clear_blocking_modal', clear))
|
||||
patches.append(mock.patch.object(auto_cycle, 'blocking_module_modal', clear))
|
||||
else:
|
||||
patches.append(mock.patch.object(auto_cycle, 'blocking_module_modal', return_value=None))
|
||||
for p in patches:
|
||||
p.start()
|
||||
try:
|
||||
@@ -108,11 +114,11 @@ class RunAalcTest(unittest.TestCase):
|
||||
self.assertFalse(ok)
|
||||
self.assertEqual(info, 'RESOURCE_OUT')
|
||||
self.assertFalse(stalled)
|
||||
# 只清了 RESOURCE_OUT_LIMIT 次就停, 而不是一路点到超时
|
||||
# 连续观察到 RESOURCE_OUT_LIMIT 次就停, 不在任务运行时点击
|
||||
self.assertIn('stop_task', self.tools(mcp))
|
||||
|
||||
def test_occasional_modal_does_not_end_the_task(self):
|
||||
"""偶发一次模态框不该收工 —— 点掉继续跑才对。"""
|
||||
"""偶发一次模态框不该收工, 继续观察任务。"""
|
||||
seq = ['x']
|
||||
mcp = FakeMcp()
|
||||
mcp.current = [RUNNING]
|
||||
@@ -122,6 +128,33 @@ class RunAalcTest(unittest.TestCase):
|
||||
# 跑到超时收工, 而不是被当成资源耗尽
|
||||
self.assertIn('超时', info)
|
||||
|
||||
def test_separate_shortage_sightings_are_not_consecutive(self):
|
||||
seq = iter(['x', None, 'x', None, 'x', None])
|
||||
mcp = FakeMcp()
|
||||
mcp.current = [RUNNING] * 6 + [DONE]
|
||||
ok, info, _ = self.poll(mcp, 3600, clear=lambda: next(seq))
|
||||
self.assertTrue(ok, info)
|
||||
self.assertNotIn('stop_task', self.tools(mcp))
|
||||
|
||||
def test_failed_stop_prevents_retry(self):
|
||||
mcp = FakeMcp([STALL, STALL], [DONE])
|
||||
original = mcp.probe
|
||||
|
||||
def probe(tool, args=None):
|
||||
result = original(tool, args)
|
||||
return {'ok': False, 'error': '进程未退出'} if tool == 'stop_task' else result
|
||||
|
||||
mcp.probe = probe
|
||||
with self.assertRaisesRegex(RuntimeError, '停止 AALC 任务失败'):
|
||||
self.run_aalc(mcp)
|
||||
self.assertEqual(self.tools(mcp), ['run_task', 'stop_task'])
|
||||
|
||||
def test_status_error_stops_the_task_before_reporting_failure(self):
|
||||
mcp = FakeMcp([{'ok': False, 'error': '连接中断'}])
|
||||
with self.assertRaisesRegex(RuntimeError, '无法读取任务状态'):
|
||||
self.run_aalc(mcp)
|
||||
self.assertEqual(self.tools(mcp), ['run_task', 'stop_task'])
|
||||
|
||||
def test_preflight_failure_is_not_retried(self):
|
||||
failed = {'state': 'failed', 'exit_code': 3,
|
||||
'errors': ['[ERROR] [lc_mcp] preflight: 队伍 1 的 sinner_order 没有罪人']}
|
||||
@@ -177,9 +210,8 @@ class BlockingModalTest(unittest.TestCase):
|
||||
|
||||
2026-10-13 实测: 模组不足时游戏弹
|
||||
"You don't have enough Enkephalin Modules. / Would you like to go assemble some?"
|
||||
AALC 的 Luxcavation 流程不认它, 一直在后面点被挡住的 Enter 按钮, 每次卡满
|
||||
10 分钟才被 no_progress 判据救回来。清道夫点 Cancel 之后 AALC 就能继续降级
|
||||
试下一关。
|
||||
AALC 的 Luxcavation 流程不认它, 一直在后面点被挡住的 Enter 按钮。
|
||||
连续观察到缺资源后先停止任务, 再重新识别并点 Cancel。
|
||||
"""
|
||||
|
||||
MODAL = [{'text': "You don't have enough Enkephalin Modules.", 'x': 554, 'y': 404, 'w': 460, 'h': 24},
|
||||
@@ -190,7 +222,8 @@ class BlockingModalTest(unittest.TestCase):
|
||||
def test_clicks_cancel_centre(self):
|
||||
clicked = []
|
||||
with mock.patch.object(auto_cycle, 'items', lambda: list(self.MODAL)), \
|
||||
mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))):
|
||||
mock.patch.object(auto_cycle, 'click',
|
||||
lambda x, y: (clicked.append((x, y)) or {'ok': True})):
|
||||
msg = auto_cycle.clear_blocking_modal()
|
||||
self.assertIn('Cancel', msg)
|
||||
# 点的是识别框中心, 不是左上角 —— 实测点左上角常常落空
|
||||
@@ -201,7 +234,8 @@ class BlockingModalTest(unittest.TestCase):
|
||||
grid = [{'text': 'TEAMS#1', 'x': 100, 'y': 300},
|
||||
{'text': 'IDENTITIES', 'x': 200, 'y': 300}]
|
||||
with mock.patch.object(auto_cycle, 'items', lambda: grid), \
|
||||
mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))):
|
||||
mock.patch.object(auto_cycle, 'click',
|
||||
lambda x, y: (clicked.append((x, y)) or {'ok': True})):
|
||||
self.assertIsNone(auto_cycle.clear_blocking_modal())
|
||||
self.assertEqual(clicked, [])
|
||||
|
||||
@@ -211,13 +245,77 @@ class BlockingModalTest(unittest.TestCase):
|
||||
{'text': 'Cancel', 'x': 30, 'y': 40, 'w': 10, 'h': 10}]
|
||||
clicked = []
|
||||
with mock.patch.object(auto_cycle, 'items', lambda: modal), \
|
||||
mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))):
|
||||
mock.patch.object(auto_cycle, 'click',
|
||||
lambda x, y: (clicked.append((x, y)) or {'ok': True})):
|
||||
self.assertIsNotNone(auto_cycle.clear_blocking_modal())
|
||||
self.assertEqual(clicked, [(35, 45)])
|
||||
|
||||
def test_rejected_click_is_not_reported_as_cleared(self):
|
||||
with mock.patch.object(auto_cycle, 'items', return_value=self.MODAL), \
|
||||
mock.patch.object(auto_cycle, 'click', return_value={'ok': False, 'error': '先 stop_task'}):
|
||||
with self.assertRaisesRegex(RuntimeError, '先 stop_task'):
|
||||
auto_cycle.clear_blocking_modal()
|
||||
|
||||
def test_real_protocol_receives_cancel_only_after_task_stops(self):
|
||||
# 使用真实 Server 的输入互斥逻辑, 避免假 click 掩盖“运行中点击被拒绝”。
|
||||
from lc_mcp.fake_engine import FakeEngine
|
||||
from lc_mcp.protocol import Server
|
||||
runner = mock.Mock()
|
||||
runner.info = {'task': 'daily'}
|
||||
runner.running.return_value = True
|
||||
runner.status.return_value = {'ok': True, 'state': 'running'}
|
||||
|
||||
def stop():
|
||||
runner.running.return_value = False
|
||||
return {'ok': True, 'state': 'stopped'}
|
||||
|
||||
runner.stop.side_effect = stop
|
||||
engine = FakeEngine(frames=[self.MODAL])
|
||||
server = Server(engine, runner)
|
||||
click_states = []
|
||||
|
||||
def click(x, y):
|
||||
click_states.append(runner.running())
|
||||
return server.call_tool('click', {'x': x, 'y': y})
|
||||
|
||||
with mock.patch.object(auto_cycle, 'probe', lambda tool, args=None: server.call_tool(tool, args or {})), \
|
||||
mock.patch.object(auto_cycle, 'items', lambda: server.call_tool('get_state', {})['items']), \
|
||||
mock.patch.object(auto_cycle, 'click', click), \
|
||||
mock.patch.object(auto_cycle, 'log'), \
|
||||
mock.patch.object(auto_cycle.time, 'time', FakeTime().time):
|
||||
ok, info, stalled = auto_cycle.poll_task('daily', 3600, sleep=lambda s: None)
|
||||
self.assertEqual((ok, info, stalled), (False, 'RESOURCE_OUT', False))
|
||||
self.assertEqual(click_states, [False])
|
||||
self.assertEqual(engine.actions, [('click', 637, 612, 1)])
|
||||
runner.stop.assert_called_once()
|
||||
|
||||
|
||||
class CycleReportTest(unittest.TestCase):
|
||||
|
||||
def test_crashed_levelup_is_a_failed_report_with_diagnostics(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
script = Path(tmp, 'broken_levelup.py')
|
||||
script.write_text('raise RuntimeError("levelup crashed")\n', encoding='utf-8')
|
||||
with mock.patch.multiple(auto_cycle, PY=sys.executable, LEVELUP=str(script)), \
|
||||
mock.patch.object(auto_cycle, 'lunacy_guard', return_value=(True, '读数一致')), \
|
||||
mock.patch.object(auto_cycle, 'ensure_team1', return_value=True), \
|
||||
mock.patch.object(auto_cycle, 'run_aalc', return_value=(True, '已完成')), \
|
||||
mock.patch.object(auto_cycle, 'goto_identities', return_value=True), \
|
||||
mock.patch.object(auto_cycle, 'report_grid', return_value='grid'), \
|
||||
mock.patch.object(auto_cycle.time, 'sleep'), \
|
||||
mock.patch('builtins.print'):
|
||||
code = auto_cycle.main(['--report-dir', tmp])
|
||||
report = json.loads(next(Path(tmp).glob('cycle_*.json')).read_text(encoding='utf-8'))
|
||||
output = next(Path(tmp).glob('cycle_*.log')).read_text(encoding='utf-8')
|
||||
self.assertEqual(code, 1)
|
||||
self.assertFalse(report['ok'])
|
||||
self.assertIn('levelup crashed', output)
|
||||
self.assertNotIn('无需升级', output)
|
||||
self.assertIsNone(auto_cycle._log_file)
|
||||
|
||||
|
||||
class LunacyReadTest(unittest.TestCase):
|
||||
"""狂气校验是"不许消费"的唯一防线, 读不到就是没校验, 所以要重试。
|
||||
"""狂气 OCR 是辅助核查, 读不到就是没校验, 所以要重试。
|
||||
|
||||
2026-10-13 实测更麻烦的一种情况: 同一个画面上 OCR 会给出**两个不同的值**
|
||||
(放大 6 倍肉眼确认余额是 6388, 而连读 5 次得到 6388 四次、8859 一次)。
|
||||
@@ -250,6 +348,23 @@ class LunacyReadTest(unittest.TestCase):
|
||||
mock.patch.object(auto_cycle.time, 'sleep', lambda s: None):
|
||||
self.assertEqual(auto_cycle.read_lunacy(), 6388)
|
||||
|
||||
def test_first_pair_does_not_override_later_majority(self):
|
||||
with mock.patch.object(auto_cycle, 'items', self._frames([8859, 8859, 6388, 6388, 6388])), \
|
||||
mock.patch.object(auto_cycle.time, 'sleep'):
|
||||
self.assertEqual(auto_cycle.read_lunacy(), 6388)
|
||||
|
||||
def test_tied_readings_are_unknown(self):
|
||||
with mock.patch.object(auto_cycle, 'items', self._frames([8859, 8859, 6388, 6388, None])), \
|
||||
mock.patch.object(auto_cycle.time, 'sleep'):
|
||||
self.assertIsNone(auto_cycle.read_lunacy())
|
||||
|
||||
def test_truncated_label_and_low_balance_are_read(self):
|
||||
frame = [{'text': 'UNACY', 'x': 671, 'y': 795},
|
||||
{'text': '0', 'x': 664, 'y': 823}]
|
||||
with mock.patch.object(auto_cycle, 'items', return_value=frame), \
|
||||
mock.patch.object(auto_cycle.time, 'sleep'):
|
||||
self.assertEqual(auto_cycle.read_lunacy(), 0)
|
||||
|
||||
def test_retries_until_the_label_shows_up(self):
|
||||
with mock.patch.object(auto_cycle, 'items', self._frames([None, None, 5864, 5864, 5864])), \
|
||||
mock.patch.object(auto_cycle.time, 'sleep', lambda s: None):
|
||||
|
||||
Reference in New Issue
Block a user