From 14cacb1d1cc9f4be6665fb5ce9434333599d0898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=99=BD=E5=8F=94?= <11794527+absfan@user.noreply.gitee.com> Date: Wed, 18 Nov 2026 10:13:55 +0800 Subject: [PATCH] release: prepare v0.2.4-beta.4 and guard late management signals Ignore queued management completion after its Qt receiver is destroyed. Isolate unrelated WMI and file-proof latency in simulated lifecycle tests while retaining real occupancy and writer-barrier coverage. Validation: 2428 tests passed, compile and whitespace checks passed, scoped review clean. Field ICDB inconsistency and Windows 10/production SMB remain unaccepted. --- docs/releases/2026-11-18-v0.2.4-beta.4.md | 34 +++++++++++++++++++ pyproject.toml | 2 +- src/cbb_refresh_verify/__init__.py | 2 +- .../ui/management_dialog.py | 8 +++-- .../support/runtime_lifecycle_frozen_smoke.py | 5 +-- tests/test_issue15_task_lifecycle_review.py | 6 ++++ tests/test_management_deleted_receiver.py | 32 +++++++++++++++++ tests/test_management_stop_after_current.py | 2 ++ 8 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 docs/releases/2026-11-18-v0.2.4-beta.4.md create mode 100644 tests/test_management_deleted_receiver.py diff --git a/docs/releases/2026-11-18-v0.2.4-beta.4.md b/docs/releases/2026-11-18-v0.2.4-beta.4.md new file mode 100644 index 0000000..f85ab19 --- /dev/null +++ b/docs/releases/2026-11-18-v0.2.4-beta.4.md @@ -0,0 +1,34 @@ +# CBB 刷新校验 v0.2.4-beta.4 + +Refs #15。延续测试版发行,供隔离副本和现场进一步验证。 + +## 本版改动 + +- 分开任务执行、原生客户端退出、资源释放及数据待恢复状态,减少旧记录和无关工程导致的误阻塞。 +- 普通校验启动阶段取消时,只有完整未写入证明和准确归属才能处理已知提示并安全收尾;原结果保留为取消,不改成 READY。 +- 已登记观察者可以持久化接管一次迟到启动的安全收尾;不循环重新打开或自动重放写操作。 +- 文件哈希、复制、校验不再因嵌套线程池阻止程序退出。恢复准备不长期持有全局原生通道,迟到任务不能继续安装。 +- 修正交接异常传递、Repair 本地资源清理、ICDB 停止信号绑定,以及管理窗口销毁后的迟到结果回调。 +- 保留当前图标、三个菜单、READY 操作范围及手动备份政策。版本/Repair 对绝对或多条 iCDBDir 的拒绝原因现在明确显示,不自动修改工程引用。 +- 沿用已确认的 3 秒默认策略;未知占用和读写确认默认跳过,强制终止默认取消。真实原生写入仍受保护。 + +## 发布验证 + +本次源码全量 **2,428 项通过,659.54 秒,退出码 0**;JUnit 零失败、零错误、零跳过。 +管理窗口销毁后的成功/失败回调先复现失败,再通过实际 Qt 信号测试验证修复。 +生命周期模拟测试隔离无关的机器 WMI/文件探测延迟,真实占用、独占句柄、资源证明和原生写入保护测试继续保留。 +新增发布改动经独立限定复核,无 Critical、Important 或 Minor 遗留项。 + +Windows 包使用合并后的 main 提交构建并上传云端;仓库当前未配置云端打包工作流。 +最终源码提交、冻结模块/资源及图标核对、冻结冒烟和 ZIP 校验结果见发行附件 +`release-info.json`、`release-smoke.json` 和 `SHA256SUMS.txt`。 +发布前因 C 盘耗尽中断的一轮,以及后续失败/修订的测试记录均保留,不计为通过。 + +## 使用与范围 + +完整解压 Windows ZIP,运行 `CbbRefreshVerify-Background/CbbRefreshVerify.exe`,保留 `_internal`。 +库写操作前按提示手动备份。程序回滚不能撤销已经完成的中心库写入。 + +自动 ICDB Repair 仍关闭。原现场不一致故障未完整复现;独立接管阶段的原生 No/Close 重放、Windows 10、生产 SMB 尚未验收。 +此前 B13 实际普通取消、后续原生调度与备份恢复的通过记录保留其原始源码/包版本,不能算成本发行包的原生重跑。 +发布测试版不关闭工单 #15,也不代表这些现场边界已经解决。 diff --git a/pyproject.toml b/pyproject.toml index 105bbd0..a333eba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools>=84.1.0"] build-backend = "setuptools.build_meta" [project] name = "cbb-refresh-verify" -version = "0.2.4b3" +version = "0.2.4b4" requires-python = ">=3.12,<3.13" dependencies = ["PySide6>=6.7,<7", "pywin32>=306", "pywinauto>=0.6.9,<0.7", "Pillow>=13.0.0,<14"] diff --git a/src/cbb_refresh_verify/__init__.py b/src/cbb_refresh_verify/__init__.py index 1e4336f..17b1675 100644 --- a/src/cbb_refresh_verify/__init__.py +++ b/src/cbb_refresh_verify/__init__.py @@ -1 +1 @@ -__version__ = "0.2.4b3" +__version__ = "0.2.4b4" diff --git a/src/cbb_refresh_verify/ui/management_dialog.py b/src/cbb_refresh_verify/ui/management_dialog.py index 3bf1313..8f3ba4e 100644 --- a/src/cbb_refresh_verify/ui/management_dialog.py +++ b/src/cbb_refresh_verify/ui/management_dialog.py @@ -5,6 +5,7 @@ from pathlib import Path from PySide6.QtCore import QObject, QThreadPool, Signal, Qt from PySide6.QtWidgets import (QCheckBox, QDialog, QFileDialog, QHBoxLayout, QLabel, QMessageBox, QPushButton, QTableWidget, QTableWidgetItem, QTextEdit, QVBoxLayout) +from shiboken6 import isValid from .workers import ServiceWorker from .backup_notice import MANUAL_BACKUP_NOTICE @@ -217,9 +218,10 @@ class ManagementDialog(QDialog): 'complete', 'RECOVERY_REQUIRED' if isinstance(error,TaskHandoff) else 'CANCELLED', not isinstance(error,TaskHandoff), str(error)) for r in requests] self.worker = ServiceWorker(execute) - self.worker.signals.succeeded.connect(context.guard_callback(self._result, current=lambda:self.context)) - self.worker.signals.failed.connect(context.guard_callback(self._failed, current=lambda:self.context)) - self.worker.signals.finished.connect(lambda:self._finished() if self.context is context else None) + current = lambda: self.context if isValid(self) else None + self.worker.signals.succeeded.connect(context.guard_callback(self._result, current=current)) + self.worker.signals.failed.connect(context.guard_callback(self._failed, current=current)) + self.worker.signals.finished.connect(lambda:self._finished() if current() is context else None) self.pool.start(self.worker) def _emit(self, context, signal, value): diff --git a/tests/support/runtime_lifecycle_frozen_smoke.py b/tests/support/runtime_lifecycle_frozen_smoke.py index e43534f..99a6402 100644 --- a/tests/support/runtime_lifecycle_frozen_smoke.py +++ b/tests/support/runtime_lifecycle_frozen_smoke.py @@ -9,6 +9,7 @@ from uuid import uuid4 workspace = Path(sys.argv[1]).resolve() bundle_root = Path(sys.argv[2]).resolve() sys.path.insert(0, str(workspace/'src')) +from cbb_refresh_verify import __version__ exe = bundle_root/'dist/CbbRefreshVerify-Background/CbbRefreshVerify.exe' root = bundle_root/('smoke-' + uuid4().hex[:8]) root.mkdir() @@ -64,7 +65,7 @@ finally: from PyInstaller.archive.readers import ZlibArchiveReader pyz = bundle_root/'build/CbbRefreshVerify/PYZ-00.pyz' code = ZlibArchiveReader(str(pyz)).extract('cbb_refresh_verify') -assert '0.2.4b3' in code.co_consts +assert __version__ in code.co_consts toc = ast.literal_eval((bundle_root/'build/CbbRefreshVerify/Analysis-00.toc').read_text('utf-8')) stack, rows = [toc], [] while stack: @@ -77,6 +78,6 @@ while stack: stack.extend(value) assert rows and all(Path(row[1]).is_relative_to(workspace/'src') for row in rows) results['module_origins'] = {'status': 'passed', 'module_count': len(rows), 'source_root': str(workspace/'src')} -results['version'] = '0.2.4b3' +results['version'] = __version__ (root/'result.json').write_text(json.dumps(results, ensure_ascii=False, indent=2), 'utf-8') print(json.dumps({'evidence': str(root/'result.json'), **results}, ensure_ascii=False), flush=True) diff --git a/tests/test_issue15_task_lifecycle_review.py b/tests/test_issue15_task_lifecycle_review.py index 174f2f0..b399328 100644 --- a/tests/test_issue15_task_lifecycle_review.py +++ b/tests/test_issue15_task_lifecycle_review.py @@ -91,6 +91,9 @@ def test_exited_verify_worker_outcome_read_is_bounded_and_releases_channel(tmp_p def poll(self): return 0 def close(self): pass monkeypatch.setattr('cbb_refresh_verify.desktop_worker.DesktopWorker', ExitedWorker) + # The fake worker has no native clients; cleanup probes are covered independently. + monkeypatch.setattr('cbb_refresh_verify.verify_runner._cleanup_session_processes', + lambda *args, **kwargs: {'safe_to_continue': True, 'remaining_pids': []}) original = Path.read_text def read(path, *args, **kwargs): if path.name == 'outcome.json': @@ -221,6 +224,9 @@ def test_handed_off_worker_accepts_exact_controls_but_excludes_new_writers(tmp_p monkeypatch.setattr(sessions, '_request_native_cancel', answer) monkeypatch.setattr(sessions, 'query_process_snapshot', lambda: [row] if child[0].poll() is None else []) monkeypatch.setattr(sessions, '_process_windows', lambda _: {}) + # Keep this real writer-barrier/control test independent of file-probe startup latency. + monkeypatch.setattr(sessions, '_finish_library_release', + lambda *args, **kwargs: {'status': 'RELEASE_CONFIRMED', 'library': str(library)}) command = lambda: sessions.release_residual_sessions(dict(library=str(library), sessions=[row]), tmp_path/'controls', cancel_native=True) def control_call(): diff --git a/tests/test_management_deleted_receiver.py b/tests/test_management_deleted_receiver.py new file mode 100644 index 0000000..d6328ce --- /dev/null +++ b/tests/test_management_deleted_receiver.py @@ -0,0 +1,32 @@ +"""Queued worker completion must not touch a destroyed management dialog.""" +import pytest +from PySide6.QtWidgets import QMessageBox +from shiboken6 import delete, isValid + + +@pytest.mark.parametrize('failed', [False, True]) +def test_queued_management_completion_ignores_deleted_receiver(qtbot, tmp_path, monkeypatch, failed): + from cbb_refresh_verify.management import ManagementRequest + from cbb_refresh_verify.ui import timed_prompt + from cbb_refresh_verify.ui.management_dialog import ManagementDialog + + def run(*args, **kwargs): + if failed: + raise ValueError('simulated native-boundary failure') + return [] + monkeypatch.setattr(timed_prompt, 'question', lambda *args, **kwargs: QMessageBox.Yes) + dialog = ManagementDialog([ManagementRequest('remove', tmp_path/'library.lmc', 'Block', + evidence_dir=tmp_path/'evidence')], runner=run) + completed = [] + dialog.completed.connect(completed.append) + try: + dialog.execute_button.click() + worker = dialog.worker # Retain the real sender while its queued signals are delivered. + assert dialog.pool.waitForDone(3000) + delete(dialog) + assert not isValid(dialog) + qtbot.wait(30) + assert not completed + finally: + if isValid(dialog): + delete(dialog) diff --git a/tests/test_management_stop_after_current.py b/tests/test_management_stop_after_current.py index b73b708..b255841 100644 --- a/tests/test_management_stop_after_current.py +++ b/tests/test_management_stop_after_current.py @@ -29,6 +29,8 @@ def test_soft_stop_finishes_current_transaction_and_skips_next(setup, qtbot, mon entered, release = Event(), Event() admitted, results = [], [] monkeypatch.setattr(backup_recovery, '_idle_check', lambda *a, **kw: None) + # Native work is simulated here; machine WMI latency is not the stop/readback boundary. + monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda names: []) monkeypatch.setattr(timed_prompt, 'question', lambda *a, **kw: QMessageBox.Yes) class Worker: