合成: 清掉同类"假成功"路径(读不到读数时不能报成功)
上一轮查明狂气防线是因为"读不到就静默跳过"而哑掉。顺着这个模式把代码过了一遍,
在 _convert_attempt 里找到同一类毛病的两个分支:
if now is not None and before is None: return True, "模组现为 %d"
return True, "模组 %s -> %s" % (before, after) # 两边都可能读到 None
读不到起点就无从判断有没有换到, 却报了成功 —— 看起来一切正常, 实际什么都没验证。
改法: 每条返回路径都必须有确认。
* 读不到起点(before is None) -> 直接不合成, 报"无法确认结果"
* 合成后读不到(after is None) -> 报"无法确认结果", 不再报成功
* 只有"读到 after 且 after != before"才报成功
另外 read_owned() 也加上重试(3 次, 每次隔 2 秒) —— 面板刚打开时数字还在刷新。
mock 逐条验证: 读不到起点 / 起点29->30 / 一直不变 / 合成后读不到 / 不在Modules页签,
五条路径的结论都正确。新增 5 个用例, 全套 277/277 通过。
This commit is contained in:
@@ -203,6 +203,62 @@ class EnkephalinGateTest(QuietLogMixin, unittest.TestCase):
|
||||
self.assertTrue(called, '重试后读到了就该正常合成')
|
||||
|
||||
|
||||
class ConvertAttemptVerifiedTest(QuietLogMixin, unittest.TestCase):
|
||||
"""⛔ 每一层"读不到"都不能被当成成功。
|
||||
|
||||
原来这段有两个假成功分支:
|
||||
if now is not None and before is None: return True, '模组现为 %d'
|
||||
return True, '模组 %s -> %s' % (before, after) # 两边都可能是 None
|
||||
读不到起点就无从判断有没有换到, 却报了成功 —— 和"狂气读不到就静默跳过"
|
||||
是同一类毛病: 降级路径看起来没事, 实际什么都没验证。
|
||||
"""
|
||||
|
||||
def _clock(self):
|
||||
c = {'t': 0.0}
|
||||
|
||||
def ft():
|
||||
c['t'] += 3.0
|
||||
return c['t']
|
||||
return ft
|
||||
|
||||
def _attempt(self, owned_fn, on_tab=True):
|
||||
with mock.patch.object(cm, 'open_panel', lambda *a, **k: True), \
|
||||
mock.patch.object(cm, 'on_modules_tab', lambda: on_tab), \
|
||||
mock.patch.object(cm, '_read_owned_once', owned_fn), \
|
||||
mock.patch.object(cm, 'click', lambda *a, **k: None), \
|
||||
mock.patch.object(cm.time, 'sleep', lambda s: None), \
|
||||
mock.patch.object(cm.time, 'time', self._clock()):
|
||||
return cm._convert_attempt()
|
||||
|
||||
def test_unreadable_start_is_not_success(self):
|
||||
ok, info, got = self._attempt(lambda: None)
|
||||
self.assertFalse(ok, '读不到起点绝不能报成功')
|
||||
self.assertIn('读不到合成前', info)
|
||||
|
||||
def test_increase_is_success(self):
|
||||
seq = [29, 29, 30]
|
||||
ok, info, got = self._attempt(lambda: seq.pop(0) if seq else 30)
|
||||
self.assertTrue(ok)
|
||||
self.assertEqual(got, 1)
|
||||
self.assertIn('29 -> 30', info)
|
||||
|
||||
def test_unchanged_is_failure(self):
|
||||
ok, info, got = self._attempt(lambda: 29)
|
||||
self.assertFalse(ok)
|
||||
self.assertIn('没变', info)
|
||||
|
||||
def test_unreadable_after_is_not_success(self):
|
||||
seq = [29] + [None] * 60
|
||||
ok, info, got = self._attempt(lambda: seq.pop(0) if seq else None)
|
||||
self.assertFalse(ok, '合成后读不到也不能报成功')
|
||||
self.assertIn('无法确认结果', info)
|
||||
|
||||
def test_wrong_tab_refuses(self):
|
||||
ok, info, got = self._attempt(lambda: 29, on_tab=False)
|
||||
self.assertFalse(ok)
|
||||
self.assertIn('Modules', info)
|
||||
|
||||
|
||||
class ConvertRetryTest(QuietLogMixin, unittest.TestCase):
|
||||
""""点了确认但模组没变"有两种原因, 该有不同的处置。
|
||||
|
||||
|
||||
Reference in New Issue
Block a user