From 3bde847ff7629ea853f0aaf6986a9c3a33d70c34 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: Thu, 19 Nov 2026 10:06:04 +0800 Subject: [PATCH] fix: skip unavailable items and isolate batch failures --- .../2026-11-19-batch-exception-isolation.json | 170 ++++++++++++ .../2026-11-19-batch-exception-isolation.md | 56 ++++ src/cbb_refresh_verify/diagnostic_open.py | 1 + src/cbb_refresh_verify/management.py | 37 ++- src/cbb_refresh_verify/operation_lifecycle.py | 4 +- src/cbb_refresh_verify/operation_queue.py | 20 +- .../ui/backup_recovery_dialog.py | 8 +- src/cbb_refresh_verify/ui/icdb_check_task.py | 28 +- src/cbb_refresh_verify/ui/main_window.py | 14 +- .../ui/management_dialog.py | 10 +- src/cbb_refresh_verify/verify_runner.py | 12 +- tests/test_batch_exception_isolation.py | 248 ++++++++++++++++++ tests/test_diagnostic_open.py | 20 ++ 13 files changed, 592 insertions(+), 36 deletions(-) create mode 100644 docs/releases/2026-11-19-batch-exception-isolation.json create mode 100644 docs/releases/2026-11-19-batch-exception-isolation.md create mode 100644 tests/test_batch_exception_isolation.py diff --git a/docs/releases/2026-11-19-batch-exception-isolation.json b/docs/releases/2026-11-19-batch-exception-isolation.json new file mode 100644 index 0000000..066c9a7 --- /dev/null +++ b/docs/releases/2026-11-19-batch-exception-isolation.json @@ -0,0 +1,170 @@ +{ + "date": "2026-11-19", + "branch": "codex/issue17-batch-cleanup", + "baseline": "07eab61", + "scope": "Final source GUI and actual Mentor, isolated constructed fault; not original field ICDB or frozen EXE acceptance", + "full_tests": { + "tests": 2472, + "failures": 0, + "errors": 0, + "skipped": 0 + }, + "seconds": 657.842, + "actual": { + "1GPHY_8212": "FAIL", + "1GPHY_RTL8211F": "PASS" + }, + "batch_seconds": 314.60899999999674, + "process_identities_checked": 8, + "exclusive_files_checked": 6, + "application_exit": 0, + "automatic_followups": 1, + "source_under_test_sha256": { + "src/cbb_refresh_verify/application.py": "aa02778f4ea4665a9d94926ae86fca32f7dadb535d1460b13fdbb064113eaf33", + "src/cbb_refresh_verify/backup_recovery.py": "eb5813b442de668650fff1ee800d3fba1409af233e374ea37b6ced688cc630e9", + "src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a", + "src/cbb_refresh_verify/close_failed_block.vbs": "e5f0d9678e07a239e96e634b90cdc761de52fc136311fae31484fa38d6fd9781", + "src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35", + "src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9", + "src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3", + "src/cbb_refresh_verify/desktop_worker.py": "81d58513369046300f81cec20a43c3e681e38e46e8131427b354f9dff0e5241a", + "src/cbb_refresh_verify/diagnostic_open.py": "32bef6547d61fe36cbb7c21f35bd45419c4cdaf10c70452ee2368269e6c75d94", + "src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b", + "src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56", + "src/cbb_refresh_verify/dialog_probe.py": "d6ecd359d9e5dbc9376c0a5b123c881670fc01d60dd3290a5f6468a2f599462f", + "src/cbb_refresh_verify/dialog_rules.py": "5531ea7b34cf2094629e7a750cb32a678701c5353a97616bcf7a89b903e386a1", + "src/cbb_refresh_verify/dialog_supervisor.py": "b0eb0aa92a18498843b51b6d8697bd0abfe8b014e1c545e32ddcc8baf7ff7274", + "src/cbb_refresh_verify/failed_session.py": "2b8a6321e1f4ff9b697d0e01ca85a8dd6e3672d3b32a9a6e4816cf495572e1a5", + "src/cbb_refresh_verify/file_probe.py": "849b1a36e4ee1fc6074cee5db5a2d5a4c806fb6e3a309df96e9cd387a66bba28", + "src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98", + "src/cbb_refresh_verify/icdb_ownership.py": "b1e25e5eddce70292c0ea2f67c2a3533273e64746b36d500b501b096470f7a5d", + "src/cbb_refresh_verify/icdb_recovery.py": "2d5ef548335ac0ca277241326ee51f5a015d327a646a7c7aa60f67165c1bfca1", + "src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed", + "src/cbb_refresh_verify/library_lock.py": "1b98c20f6127ad9b29cbf4f082289b093ec89475313e016dcb88202308cf9587", + "src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195", + "src/cbb_refresh_verify/library_reader.py": "7831b502aa1f637426ab2e22f11cb6666e69200b7615925050a5af7472a84b2b", + "src/cbb_refresh_verify/maintenance_entry.py": "ddd0480ad8b04fd99462befbe6683bace526bf5085afb1ee3de918f30e796683", + "src/cbb_refresh_verify/management.py": "1a5d33cc75577de11bfbd06c780a46e4679089b44c42f51454e2fdbb4ac4b7ad", + "src/cbb_refresh_verify/management_transaction.py": "53ed1564d42492465c90117eeeeee25aa93324b5ddca702d0827ec786c75b1a1", + "src/cbb_refresh_verify/mentor_adapter.py": "b9485603e42fc098ba93fd90b5adce7b0b89085ede6390019d3be9332795eb18", + "src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116", + "src/cbb_refresh_verify/models.py": "94d9d28c61ff7642ae59ac9af91a698bffd15c86a995295576fbbb2143faf789", + "src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94", + "src/cbb_refresh_verify/native_backup.py": "152235f69aefe1bd1338fdd0ed2dec8afb7355de63399f746b02e31047be7909", + "src/cbb_refresh_verify/native_engineering_identity.py": "8c0fc144707d68a9b85f6da50ef950f1f6e7fee248acbf34d19b707d51212be0", + "src/cbb_refresh_verify/native_export_guard.py": "3f6af07737ee670584e6fa9d004c040cf318c3d568e8fa82f84eb70d351b3d6a", + "src/cbb_refresh_verify/native_management.py": "38503011be1c0d4755dd72a4d283d7704937aa576e9f8f9fc3382fc9f4b0be4e", + "src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49", + "src/cbb_refresh_verify/native_repair.py": "a720758b8195fd399c81673c13a1d38e69917c9c053e28967ff4e75f40118950", + "src/cbb_refresh_verify/native_repair_ui.py": "9bfb413193d9a917f5ac71d5826e6682b3d0e40d822a5f8366a28f71ca542690", + "src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f", + "src/cbb_refresh_verify/operation_lifecycle.py": "c91041b6e2f7d88f3460b4cdf184df59ff5183c8bc478704e3d442e4ae0406f3", + "src/cbb_refresh_verify/operation_queue.py": "7a2f08d4bc32d1de0a3151d509d41e676fbc962aba2a9346008c71a48adf0e79", + "src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903", + "src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5", + "src/cbb_refresh_verify/pcb_open_consent.py": "ba4d8da5ce3f7ed924621eb37b925371f14d074acaf9814adfb0f77fc6bb73e1", + "src/cbb_refresh_verify/pcb_restore_prompt.py": "a488ab48845173f463042c17ad1e719fe37a4bcf98a660f06453eef171b0e7bb", + "src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4", + "src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63", + "src/cbb_refresh_verify/reimport_recovery.py": "ef148549751fa47518f5f2ca8f32ba25794ec5f22e0de545476ea33f89a3f0bf", + "src/cbb_refresh_verify/residual_sessions.py": "fcf75f47f650a81c2794519bc211640214b6d888bcfb43dd7fbbf146a8a3012e", + "src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e", + "src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367", + "src/cbb_refresh_verify/save_verified_block.vbs": "862fc40f4cf59c73ff0efa3dee1de3fff92df019e43cce46d4fa337378087143", + "src/cbb_refresh_verify/scoped_manifest.py": "f141cfedc901ddadb9be837bc0cbb69c57614d44ab9c347d63bbfa15d4be4a8b", + "src/cbb_refresh_verify/session_record.py": "0273758c6c28557b45230258762756cf05eac5ea2f8f08a8cb7deae2857694fa", + "src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196", + "src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8", + "src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2", + "src/cbb_refresh_verify/verify_runner.py": "cbdf6cce5a5104edcf1f6b9d66dc2e379d2ffc92989e9cc231c13a4d719e4d8f", + "src/cbb_refresh_verify/write_admission.py": "c5f879bd5cb70a5dedfc64349c8758bf370daa4240491addd2aecd344f3a935c", + "src/cbb_refresh_verify/__init__.py": "673ad8f884cd8a8f4c4097b348be1b77999ec018bdc6c70ab26b8cc383669878", + "src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0", + "src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6", + "src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8", + "src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328", + "src/cbb_refresh_verify/assets/dialog_rules.v1.json": "3911080fc799a819662e225a7ad73e883abd8dcc9936cc30ec1b2d6d51a03c6e", + "src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599", + "src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "5453c1b61ad2969cb3071d7ccf0bba571bcb0d1dac8270b3c96ec0dd1c3d88ff", + "src/cbb_refresh_verify/ui/icdb_check_task.py": "70a678e632487e0e829798284ee7644af0ecb0b27212866dfb23cdb6db6e168d", + "src/cbb_refresh_verify/ui/main_window.py": "368263a7aa57a85de4c76485ff83d68e12bcfd6254a874425bcaa53049c258a1", + "src/cbb_refresh_verify/ui/management_dialog.py": "fc67d7d3a4ba07ccbff5b40f789192c85c8dafa64349446e6a7d86b5f20941d2", + "src/cbb_refresh_verify/ui/pcb_open_dialog.py": "1b9689d555d221567263b6b587250b51a11bef276c35d64393e1b3d13803c625", + "src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "11479db5520310af37824e083cb678d69d4cfd12f70dcd29ccb906b929e3d9bd", + "src/cbb_refresh_verify/ui/residual_release_dialog.py": "c2ebc63dd67186dff8ab2300a04ec173219314c2ad01cc70621630f30295a9cc", + "src/cbb_refresh_verify/ui/timed_prompt.py": "bafd5027d396e50458e4bd81e4596be51ebf87353f688e31943a97d71d2d5121", + "src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888", + "src/cbb_refresh_verify/ui/write_owner_dialog.py": "65dc3c8287f4ac5dc767797c13e192f6bd916f9051570a33a2b18f4f8334c3b3", + "src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + }, + "original_source_postcheck": { + "status": "PASS", + "source": "G:\\CbbIssue15FinalAccept-20261117\\run-final-01\\library", + "checked_at": "2026-11-19T01:53:06.022051+00:00", + "files": 28348, + "missing": [], + "added": [], + "changed": [], + "excluded": "top-level .mentor_lib.cbb-upload.* coordinator files, matching pre-test manifest" + }, + "forced_native_terminations": 0, + "native_lock_deletions": 0, + "previous_failed_run_preserved": true, + "raw_evidence_sha256": { + "G:\\CbbBatchIsolationFinal-20261119\\source-under-test.json": { + "bytes": 9066, + "sha256": "47ea3e517051d06467aae4e8174d446013486d4408bfa18ad62a6cfe230211f1" + }, + "G:\\CbbBatchIsolationFinal-20261119\\actual-result.json": { + "bytes": 2278, + "sha256": "4cf80df3b3a217acc752ea4113e7cd3fca72dea16927f0a7f40b3bc746cc3030" + }, + "G:\\CbbBatchIsolationFinal-20261119\\closure-proof.json": { + "bytes": 5026, + "sha256": "d8cb14b49ba2efa960faba43aec1dd6c7ddff1ba7af343920ec49c141bd39d96" + }, + "G:\\CbbBatchIsolationFinal-20261119\\preparation-result.json": { + "bytes": 17036, + "sha256": "a74a5f0dc508c7ae55ca111c1cb8177be35d6872ceb7a65118012586c2b10549" + }, + "G:\\CbbBatchIsolationFinal-20261119\\original-source-postcheck.json": { + "bytes": 321, + "sha256": "cfcd3fb37367272f196e0cb48d6dae0cbbe67edc230743b89a92c6394c104cf3" + }, + "G:\\CbbBatchIsolationFinal-20261119\\native\\run-source-01\\ui-01\\results\\1795053108621710900-4461.json": { + "bytes": 100, + "sha256": "9f0cb90cca6bc4388da6e21884e13772fd658272d89b1d4f294f0648cc828d40" + }, + "G:\\CbbIssueLatest-20261118\\checks\\batch-isolation-final-full.log": { + "bytes": 2981, + "sha256": "955453a903ddb443fd103e3115c54abff9ec94039f3d5d08c6868fdf67d30cd3" + }, + "G:\\CbbIssueLatest-20261118\\checks\\batch-isolation-final-full.xml": { + "bytes": 360637, + "sha256": "fa878c69b35f701f00bead1b1df137a96fd35ba14856d88b591542526030f6a7" + }, + "G:\\CbbIssueLatest-20261118\\checks\\batch-isolation-full.log": { + "bytes": 13963, + "sha256": "78367028f332c4192e8458c66d25390aee1905160d6eeeb5c7f689cccdf6af5f" + }, + "G:\\CbbIssueLatest-20261118\\checks\\batch-isolation-full.xml": { + "bytes": 371306, + "sha256": "57d9c2916a3c104ac4fa498439d84d815886e975d6a2bb86d1521a26fe78173d" + }, + "G:\\CbbIssueLatest-20261118\\checks\\batch-isolation-regressions-green.log": { + "bytes": 302, + "sha256": "6167237d4f29af707fa8d05f546dd46fa4be72fbe70153ab3135446c037173ac" + }, + "G:\\CbbIssueLatest-20261118\\checks\\cancellation-deadline-red.log": { + "bytes": 7668, + "sha256": "c1354beab3db9a3624e20678be6f3bcc5a823e5331d708f0ce4b34fb3028aa1a" + }, + "G:\\CbbIssueLatest-20261118\\batch-isolation-review.md": { + "bytes": 17553, + "sha256": "81181b51d5c30309659db16340b662b2ae62d3cab3139378c74f16a811b012c9" + } + }, + "merged": false, + "released": false, + "issue_closed": false +} diff --git a/docs/releases/2026-11-19-batch-exception-isolation.md b/docs/releases/2026-11-19-batch-exception-isolation.md new file mode 100644 index 0000000..6e0cd0d --- /dev/null +++ b/docs/releases/2026-11-19-batch-exception-isolation.md @@ -0,0 +1,56 @@ +# 异常项跳过与阻塞范围复核 + +基线:`07eab61`。分支:`codex/issue17-batch-cleanup`。日期:2026-11-19。 + +## 结论与范围 + +上一轮不能宣称没有阻塞:生产任务在排队时仍可能无限等待活跃观察会话;ICDB 和管理批次仍将一次未释放结果永久缓存到后续同库项;管理的意外异常和进度接收器异常还能让整批结果丢失。 + +这轮修正这些分支,不改变原生保存成功条件或 ICDB 诊断判据。普通单项失败保留 FAIL,后续项继续。当前项从未启动时,记录 SKIPPED 和准入原因,不声称新建了待释放会话。确有未释放写入时,冲突项逐项跳过,独立任务继续;没有把“继续遍历”解释为绕过真实占用继续写同一个中心库。 + +| 条件 | 当前项与后续行为 | 识别依据 | +| --- | --- | --- | +| 前项操作失败但已释放 | 保留原失败,继续下一项 | 原生保存/关闭/退出、资源释放证明各自核对 | +| 后台已登记会话仍运行/初始化 | 当前项未启动即 SKIPPED,继续遍历,无无限排队 | `NATIVE_SESSION_PENDING`,仅活跃观察缓存;历史孤立记录不触发这个准入判定 | +| 前项原生写入仍未确认释放 | 下一项前复核原占用项,确认释放后去除全部库别名缓存;否则跳过冲突项 | `PREVIOUS_SESSION_UNRELEASED`,记录原占用 CBB,不能归为新项 ICDB 错误 | +| 库管理出现未预期异常 | 单项 RECOVERY_REQUIRED;保留未知释放事实,同库冲突项跳过,其他独立库继续 | `BATCH_ITEM_EXCEPTION`,不凭异常类型伪造安全释放 | +| 界面进度接收器失效 | 不改变业务结果和后续执行 | 复用已有容错通知函数 | +| 用户明确停止/关闭队列 | 尊重停止;保留已完成项 | 与“资源未准入”分开,取消优先 | + +生产校验、ICDB 检查、库管理、备份恢复及目录读取启用“未准入即跳过/返回”的规则。显式恢复控制仍可接近其原占用会话,普通串行排队和用户主动暂停保留原有行为。只检查缓存的活跃观察状态;不在 GUI 排队谓词里访问文件、查询进程或启动 Mentor。 + +特别补齐界面调用链:备份恢复、自定义管理入口及主窗口错误处理不得把启动前的 `QueueUnavailable` 转成 FAIL/RECOVERY_REQUIRED 或新增保留租约;全跳过的批次不再刷新空目标集合,也不以刷新失败覆盖结果。 + +## 验证 + +证据目录:`G:/CbbBatchIsolation-20261119`;自动化日志:`G:/CbbIssueLatest-20261118/checks`。 + +- `batch-isolation-red`:9 个新增回归均失败,复现无限等待、缓存不复核与异常逃逸。 +- `batch-isolation-edges-red`:复现取消竞争、取消时原结果丢失及进度接收器异常;其中 UI 测试最初错误地要求正常结束的 context 不可被 close/cancel,后改为核对业务结果没有 CANCELLED,未据此修改产品。 +- `admission-ui-red`:3 个界面误报未释放分支均失败;修正后新增回归共 16 项通过。 +- 相关回归 212 项通过;进一步界面和租约回归 33 项通过。编译检查与 `git diff --check` 通过。 +- 首轮全量 `batch-isolation-full` 保留 2 failed / 2,469 passed:新增原占用提示访问字符串注入项的 `block_name` 导致 AttributeError;窗口扫描期间已取消却先超时,返回错误诊断类别。前者用既有合同用例复现,后者新增确定时钟用例复现;均先 RED 后修正。82 项相关回归通过。不是仅调大测试超时;产品扫描返回后立即复核取消,确保不再执行后续窗口动作。最终源码的全量与原生验收重新运行。 +- 最终全量 `python -X utf8 G:/CbbIssueLatest-20261118/run_checks.py batch-isolation-final-full -q`:**2,472 passed,0 failure/error/skipped**,665.57 秒,实际退出码 0。相邻 JSON 保存测试统计、最终源码指纹和原始证据 SHA-256。 +- 最终原始输入核对 `G:/CbbBatchIsolationFinal-20261119/original-source-postcheck.json`:28,348 个文件 SHA-256、大小、修改时间和集合完全一致;缺失、新增、修改均为 0,顶层旧协调记录的排除规则沿用复制前清单。 + +### 本轮新源码实际按钮验收 + +下述首次原生结果保留在 `G:/CbbBatchIsolation-20261119`,对应上述两处补修之前的源码。最终源码另用 `G:/CbbBatchIsolationFinal-20261119` 保存完整记录,不覆盖第一次证据。 + +`actual-result.json`:同一批次 `1GPHY_8212` 为 FAIL/`MENTOR_DATABASE_LOAD_FAILED`(101.859 秒),完成释放后 `1GPHY_RTL8211F` 为 PASS/GREEN(130.844 秒);权威状态 READY,四项同步、Save/IsSaved/Close 均通过。批次总计 259.875 秒,恰好两行,零 SKIPPED。运行中改变搜索条件、清空勾选、切换管理/校验页,提交时目标保持一致,任务结束后取消按钮禁用。 + +`closure-proof.json`:5 个精确进程身份退出,6 个关键文件独占打开,76 个源码/资源 SHA-256 与实际测试版本一致。原构造损坏头部未变,未强杀原生进程、未删除原生锁;应用随后正常关闭,退出码 0。本轮健康项首轮即 READY,没有触发旧版本已单独实测过的补充校验分支,不能把本次结果写成又一次自动补充校验验收。 + +**最终源码重验**(`G:/CbbBatchIsolationFinal-20261119`):8212 为 FAIL/`MENTOR_DATABASE_LOAD_FAILED`、safe=true(88.265 秒);RTL 首轮 `verify-f1c25f324bb3` 为 FAIL/NOT_GREEN、safe=true(101.937 秒),自动补充一次 `verify-f011eceff63f` 后 PASS/GREEN、权威 READY、safe=true(101.078 秒)。报告累计健康项原生耗时 203.015 秒,批次 314.609 秒,恰好 FAIL/PASS 两行、零 SKIPPED。首轮失败原样保留,`commit-followup.json` 为 READY,限制额外调用 1 次。 + +最终 `closure-proof.json` 核对 8 个精确进程身份退出、6 个关键文件独占打开、全部 76 个源码/资源哈希一致。故障头部未改变,没有强杀或删原生锁;最终应用也正常关闭 exit 0,`ui-01/results` 保存 finish 回执。正常关闭时的初始保守 shutdown 盘点文件不是最终释放证明,保留其原值,由独立进程/文件证明和退出回执确认收尾。 + +本次实际验证复用此前明确隔离的构造损坏库。新建独立 GUI 数据/证据目录;健康项通过正常原生同名更新准备为 PENDING,未修改客户库。原生准备过程为 UPLOADED、safe=true;准备阶段的 after-remove catalog 窗口观察线程曾记录 `EnumDesktopWindows` 错误码 0,主目录读取成功且已退出;该条原始日志保留,不能据此声称所有原生线程均无异常。 + +新源码 GUI 读取时,测试驱动 UIA 在重绘期间遇到 `CurrentIsEnabled/-2147220991`,原控制结果保留。只给只读枚举增加有限重试,恢复同一个应用,不重复回放已提交的写动作。产品后端未替换为模拟校验。 + +## 验收边界 + +不会承诺“所有写操作永远能继续”:同一原生写会话、中心库或共享数据库仍在使用时,冲突写入必须保持未执行。用户主动暂停、停止以及手动打开的原生维护窗口也不是工程损坏。准确报告这些状态比把它们标成 ICDB 故障更重要。 + +ICDB 问题仍需本轮原生错误内容支撑;数据库一般加载失败、共享库访问失败、无法确认状态和会话未释放不等同于 ICDB 损坏。构造头部损坏的通过结果也不等于客户原始故障已修复。本轮不发布新包、不合并、不关闭工单。 diff --git a/src/cbb_refresh_verify/diagnostic_open.py b/src/cbb_refresh_verify/diagnostic_open.py index 81d2c88..b4a1419 100644 --- a/src/cbb_refresh_verify/diagnostic_open.py +++ b/src/cbb_refresh_verify/diagnostic_open.py @@ -463,6 +463,7 @@ def check_target_window(job, pcb_pid, *, emit, error_reader, launcher_process=No if not session.pcb_alive(): raise RuntimeError('DIAGNOSTIC_OPEN_UNCONFIRMED: target PCB exited before loaded evidence') windows = scan(deadline) + _cancel(job) if any(window['pid'] != int(pcb_pid) for window in windows): raise RuntimeError('DIAGNOSTIC_PID_MISMATCH') frame = _target_frame(windows, Path(job['pcb']).stem, require_ready=False) diff --git a/src/cbb_refresh_verify/management.py b/src/cbb_refresh_verify/management.py index fa71571..2a6ea99 100644 --- a/src/cbb_refresh_verify/management.py +++ b/src/cbb_refresh_verify/management.py @@ -171,7 +171,7 @@ def _may_have_mutated(record): def run_management(request, *, adapter=None, verifier=None, idle_check=None, progress=None, stop=None, version_prompt=None, write_admission=None): - from .verify_runner import VerifyRequest, run_verify + from .verify_runner import VerifyRequest, run_verify, _notify_progress from .backup_recovery import _idle_check from contextlib import ExitStack from .operation_queue import check_active, native_channel, task_stop, remember_result @@ -216,7 +216,7 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro _write_json(report, {**asdict(request), 'stage': stage, 'status': 'RUNNING', 'safe_to_continue': False, 'history': history, 'backup_policy': 'manual'}) if progress: - progress({'stage': stage, 'block': request.name, 'operation': request.operation, **details}) + _notify_progress(progress, {'stage': stage, 'block': request.name, 'operation': request.operation, **details}) def finish(status, detail='', safe=True): nonlocal change_report remember_result(ManagementResult(request.operation, request.library, request.name, request.partition, @@ -465,7 +465,8 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro def run_management_batch(requests, *, stop=None, progress=None, item_executor=None, context=None, **kwargs): from threading import Event from .write_admission import WriteAdmission - from .operation_queue import QueueCancelled, TaskHandoff, request_library_keys, remember_result, current_context + from .verify_runner import _notify_progress + from .operation_queue import QueueCancelled, QueueUnavailable, TaskHandoff, request_library_keys, remember_result, current_context context = context or current_context() if context is not None: stop = stop if stop is not None else context.stop @@ -474,19 +475,30 @@ def run_management_batch(requests, *, stop=None, progress=None, item_executor=No stop = Event() kwargs.setdefault('write_admission',WriteAdmission(prompt=kwargs.get('version_prompt'),stop=stop)) results = [] - retained_libraries = set() + retained_libraries = {} cancelled = False for request in requests: keys = request_library_keys(request, context) stopped = (cancelled or stop.is_set() or context is not None and (context.stop.is_set() or context.stop_after_current.is_set())) + if not stopped: + for index in {retained_libraries[key][1] for key in keys.intersection(retained_libraries)}: + previous = next(value[0] for value in retained_libraries.values() if value[1] == index) + from .operation_lifecycle import recheck_failed_release + refreshed = recheck_failed_release(previous.library, previous.name, results[index], stop=stop) + if refreshed.safe_to_continue: + results[index] = refreshed + retained_libraries = {k:v for k,v in retained_libraries.items() if v[1] != index} if stopped or keys.intersection(retained_libraries): + previous = (retained_libraries[next(iter(keys.intersection(retained_libraries)))][0] + if not stopped else None) result = ManagementResult(request.operation, request.library, request.name, request.partition, - request.source, request.auto_verify, 'complete', 'SKIPPED', True, - '队列已停止,未操作此 CBB' if stopped else '同库原生会话尚未释放,未启动新的写入') + request.source, request.auto_verify, 'admission', 'SKIPPED', True, + '队列已停止,未操作此 CBB' if stopped else + f'PREVIOUS_SESSION_UNRELEASED: 前项 {previous.name} 的同库会话尚未释放,当前项未启动。') results.append(result) if progress: - progress({'stage': result.status, 'block': result.name, 'detail': result.detail}) + _notify_progress(progress, {'stage': result.status, 'block': result.name, 'detail': result.detail}) continue def action(): result = run_management(request, progress=progress, stop=stop, **kwargs) @@ -497,6 +509,9 @@ def run_management_batch(requests, *, stop=None, progress=None, item_executor=No return result try: result = item_executor(request, action) if item_executor is not None else action() + except QueueUnavailable as error: + result = ManagementResult(request.operation, request.library, request.name, request.partition, + request.source, request.auto_verify, 'admission', 'SKIPPED', True, str(error)) except QueueCancelled as error: known = error.result if isinstance(error, TaskHandoff) else None if isinstance(known, ManagementResult): @@ -510,12 +525,16 @@ def run_management_batch(requests, *, stop=None, progress=None, item_executor=No request.source, request.auto_verify, 'complete', 'TIMEOUT' if isinstance(error, TaskHandoff) and not error.cancelled else 'CANCELLED', not isinstance(error, TaskHandoff), str(error)) + except Exception as error: + result = ManagementResult(request.operation, request.library, request.name, request.partition, + request.source, request.auto_verify, 'exception', 'RECOVERY_REQUIRED', False, + 'BATCH_ITEM_EXCEPTION: '+str(error)) results.append(result) if progress: - progress({'stage': result.status, 'block': result.name, 'detail': result.detail, + _notify_progress(progress, {'stage': result.status, 'block': result.name, 'detail': result.detail, 'evidence_path': str(result.evidence_path or '')}) if not result.safe_to_continue: - retained_libraries.update(keys) + retained_libraries.update({key:(request, len(results)-1) for key in keys}) if result.status == 'CANCELLED': cancelled = True return results diff --git a/src/cbb_refresh_verify/operation_lifecycle.py b/src/cbb_refresh_verify/operation_lifecycle.py index fcdec8d..2c95e8f 100644 --- a/src/cbb_refresh_verify/operation_lifecycle.py +++ b/src/cbb_refresh_verify/operation_lifecycle.py @@ -6,13 +6,13 @@ def recheck_failed_release(library, block, result, *, stop=None, timeout_seconds """Refresh resource facts after a late exit; keep the original business failure.""" if result.safe_to_continue or not result.evidence_path: return result - from .operation_queue import BatchTaskContext, TaskHandoff, current_context, task_stop + from .operation_queue import BatchTaskContext, QueueCancelled, current_context, task_stop if current_context() is None: context = BatchTaskContext(library=str(library), targets=(block,)) try: return context.run(lambda: recheck_failed_release(library, block, result, stop=stop), stop=stop, timeout_seconds=timeout_seconds) - except TaskHandoff: + except QueueCancelled: return result stop = task_stop(stop) from pathlib import Path diff --git a/src/cbb_refresh_verify/operation_queue.py b/src/cbb_refresh_verify/operation_queue.py index 3b5b6f1..bf6817d 100644 --- a/src/cbb_refresh_verify/operation_queue.py +++ b/src/cbb_refresh_verify/operation_queue.py @@ -11,6 +11,14 @@ class QueueCancelled(RuntimeError): pass +class QueueUnavailable(RuntimeError): + """Admission failed before action dispatch; this task created no native session.""" + def __init__(self, library): + self.library = str(library) + super().__init__('NATIVE_SESSION_PENDING: '+self.library+ + ' 的已登记会话仍在运行或初始化,当前项未启动。') + + class TaskHandoff(QueueCancelled): """The call is still observable; this is never a release receipt.""" def __init__(self, context, *, cancelled=False, result=None): @@ -409,14 +417,19 @@ class NativeQueue: for context in contexts) def run(self, action, *, stop=None, waiting=None, ready=lambda: True, wait_state=None, - context=None, timeout_seconds=10): + context=None, timeout_seconds=10, skip_unavailable=False): def available_now(): if not ready(): return False if context is None: return True # Explicit recovery controls must still reach their retained clients. from .session_record import _live_library_available - return all(_live_library_available(path) for path in (context.library, *context.aliases)) + for path in (context.library, *context.aliases): + if not _live_library_available(path): + if skip_unavailable: + raise QueueUnavailable(path) + return False + return True ticket = [object(), False] acquired, notified = False, False previous_state = None @@ -428,6 +441,9 @@ class NativeQueue: self.pending.append(ticket) try: while not acquired: + if (self.closed or stop is not None and stop.is_set() + or context is not None and (context.stop.is_set() or context.stop_after_current.is_set())): + raise QueueCancelled('已取消排队,未启动原生操作。') available = available_now() # Cached predicates only, outside the queue lock. with self.condition: if (self.closed or stop is not None and stop.is_set() diff --git a/src/cbb_refresh_verify/ui/backup_recovery_dialog.py b/src/cbb_refresh_verify/ui/backup_recovery_dialog.py index 0fedaeb..8926709 100644 --- a/src/cbb_refresh_verify/ui/backup_recovery_dialog.py +++ b/src/cbb_refresh_verify/ui/backup_recovery_dialog.py @@ -113,13 +113,17 @@ class BackupRecoveryDialog(QDialog): options = {'version_prompt': lambda choice:self._emit(context, 'choice',choice),'stop':context.stop} if self.recoverer is None else {} action = lambda: recoverer(request, source, progress=lambda event:self._emit(context, 'progress',event), **options) if self.native_queue is None: return context.run(action) - from ..operation_queue import QueueCancelled + from ..operation_queue import QueueCancelled, QueueUnavailable def restore(): self._emit(context, 'progress',{'stage': 'queue_acquired'}) return action() try: - return self.native_queue.run(restore, stop=context.stop, context=context, waiting=lambda: self._emit(context, 'progress', + return self.native_queue.run(restore, stop=context.stop, context=context, skip_unavailable=True, waiting=lambda: self._emit(context, 'progress', {'stage': 'waiting_native_slot', 'detail': '已排队,等待当前检查结束'})) + except QueueUnavailable as error: + from ..verify_runner import VerifyResult + return VerifyResult('SKIPPED', stderr=str(error), error_category='NATIVE_SESSION_PENDING', + error_stage='admission') except QueueCancelled as error: from ..operation_queue import TaskHandoff from ..verify_runner import VerifyResult, _handoff_verify_result diff --git a/src/cbb_refresh_verify/ui/icdb_check_task.py b/src/cbb_refresh_verify/ui/icdb_check_task.py index 3aa077a..3c54989 100644 --- a/src/cbb_refresh_verify/ui/icdb_check_task.py +++ b/src/cbb_refresh_verify/ui/icdb_check_task.py @@ -1,7 +1,7 @@ """A check batch owns its snapshot and yields the native queue after each CBB.""" from PySide6.QtCore import QObject, QThreadPool, Signal from .workers import ServiceWorker -from ..operation_queue import QueueCancelled, BatchTaskContext +from ..operation_queue import QueueCancelled, QueueUnavailable, BatchTaskContext, request_library_keys from ..verify_runner import VerifyResult, run_verify, write_batch_report from ..icdb_maintenance import write_maintenance_report @@ -30,7 +30,7 @@ class IcdbCheckTask(QObject): self.running = False self.report = None self.report_error = '' - self.retained_libraries = set() + self.retained_libraries = {} self.pool = QThreadPool(self); self.pool.setMaxThreadCount(1) def _emit_event(self, event): @@ -66,9 +66,6 @@ class IcdbCheckTask(QObject): if self.stop.is_set(): self.results.extend(VerifyResult('SKIPPED', stderr='队列已停止,未操作此 CBB') for _ in self.requests[len(self.results):]) - while len(self.results) < len(self.requests) and str( - self.requests[len(self.results)].lmc_file).casefold() in self.retained_libraries: - self.results.append(VerifyResult('SKIPPED', stderr='同库原生会话尚未释放,未启动新的检查')) if len(self.results) == len(self.requests): self._report(); return if self.paused: return @@ -76,6 +73,19 @@ class IcdbCheckTask(QObject): def check(): from ..session_record import library_available, library_wait_reason try: + keys = request_library_keys(request, self.context) + for index in {self.retained_libraries[key] for key in keys.intersection(self.retained_libraries)}: + previous = self.requests[index] + from ..operation_lifecycle import recheck_failed_release + refreshed = recheck_failed_release(previous.lmc_file, previous.block_name, + self.results[index], stop=self.stop) + if refreshed.safe_to_continue: + self.results[index] = refreshed + self.retained_libraries = {k:v for k,v in self.retained_libraries.items() if v != index} + if keys.intersection(self.retained_libraries): + index = self.retained_libraries[next(iter(keys.intersection(self.retained_libraries)))] + return VerifyResult('SKIPPED', error_category='PREVIOUS_SESSION_UNRELEASED', + error_stage='admission', stderr=f'前项 {self.requests[index].block_name} 的同库会话尚未释放,当前项未启动。') def execute(): if self.status_reader is not None: statuses = self.status_reader((request.block_name,), request.lmc_file) @@ -92,12 +102,15 @@ class IcdbCheckTask(QObject): from ..operation_lifecycle import recheck_failed_release result = recheck_failed_release(request.lmc_file, request.block_name, result) return result - return self.queue.run(execute, stop=self.stop, context=self.context, + return self.queue.run(execute, stop=self.stop, context=self.context, skip_unavailable=True, wait_state=lambda: (self.paused, library_wait_reason(request.lmc_file)), ready=lambda: not self.paused, waiting=lambda: self._emit_event({'stage': 'waiting_native_slot', 'block': request.block_name, 'library': str(request.lmc_file), 'retained': not library_available(request.lmc_file), 'detail': library_wait_reason(request.lmc_file) or '已排队,等待当前原生操作结束'})) + except QueueUnavailable as error: + return VerifyResult('SKIPPED', stderr=str(error), error_category='NATIVE_SESSION_PENDING', + error_stage='admission') except QueueCancelled as error: from ..operation_queue import TaskHandoff from ..verify_runner import _handoff_verify_result @@ -116,7 +129,8 @@ class IcdbCheckTask(QObject): request = self.requests[len(self.results)] name = request.block_name if not result.safe_to_continue: - self.retained_libraries.add(str(request.lmc_file).casefold()) + self.retained_libraries.update({key:len(self.results) + for key in request_library_keys(request, self.context)}) self.results.append(result) if result.status in ('CANCELLED', 'QUEUE_STOP'): self.stop.set() self.item_done.emit(name, result) diff --git a/src/cbb_refresh_verify/ui/main_window.py b/src/cbb_refresh_verify/ui/main_window.py index 842446c..08607ec 100644 --- a/src/cbb_refresh_verify/ui/main_window.py +++ b/src/cbb_refresh_verify/ui/main_window.py @@ -1059,7 +1059,7 @@ class MainWindow(QWidget): event['detail'] = label+'中…' emit(event) return action() - return lambda: self.native_queue.run(execute, stop=stop, context=job.context if job else None, + return lambda: self.native_queue.run(execute, stop=stop, context=job.context if job else None, skip_unavailable=True, wait_state=lambda: library_wait_reason(library), waiting=lambda: emit({'stage': 'waiting_native_slot', 'library': str(library), 'retained': not library_available(library), @@ -1442,7 +1442,7 @@ class MainWindow(QWidget): return result, reasons, lease, library, False # Full-library status and preflight follow native catalog IO; ten seconds # is not enough even on a local 364-entry library. Keep one bounded task. - worker = ServiceWorker(lambda:self.native_queue.run(reconcile, context=context, timeout_seconds=120)) + worker = ServiceWorker(lambda:self.native_queue.run(reconcile, context=context, timeout_seconds=120, skip_unavailable=True)) self._lifecycle_workers.add(worker) def completed(payload): if self._job_current(read_job): deliver(payload) @@ -1789,12 +1789,12 @@ class MainWindow(QWidget): safe = all(result.safe_to_continue for result in results) self._emit_job(job, 'batch_ready', (results, report)) refresh = None - if safe and not job.context.stop.is_set(): - from cbb_refresh_verify.operation_queue import QueueCancelled + if safe and affected and not job.context.stop.is_set(): + from cbb_refresh_verify.operation_queue import QueueCancelled, QueueUnavailable try: refresh = self._queued_action(lambda: self._read_affected_records(affected, library=library, lease=job.lease), label='批次已结束,状态刷新', library=library, job=job)() - except QueueCancelled: + except (QueueCancelled, QueueUnavailable): pass # Cancelling the refresh must not erase completed item results. return results, report, affected, refresh self._start(action, self._batch_refreshed, queued=False, job=job, bounded=False) @@ -2158,8 +2158,8 @@ class MainWindow(QWidget): '已请求取消;检查将停止,原生写入只等待安全结束,不强制终止。'); self._update() def _failed(self, error): - from cbb_refresh_verify.operation_queue import QueueCancelled - if self.library_lease is not None and not isinstance(error, QueueCancelled): + from cbb_refresh_verify.operation_queue import QueueCancelled, QueueUnavailable + if self.library_lease is not None and not isinstance(error, (QueueCancelled, QueueUnavailable)): self._retain_path_lease(self.library_lease, hold_busy=True) self._display_error(error) diff --git a/src/cbb_refresh_verify/ui/management_dialog.py b/src/cbb_refresh_verify/ui/management_dialog.py index 8f3ba4e..5b9c332 100644 --- a/src/cbb_refresh_verify/ui/management_dialog.py +++ b/src/cbb_refresh_verify/ui/management_dialog.py @@ -193,12 +193,12 @@ class ManagementDialog(QDialog): action = lambda: self.runner(requests, adapter=self.adapter, stop=context.stop, progress=lambda event:self._emit(context, 'progress',event),**choices) if self.native_queue is None: return context.run(action) - from ..operation_queue import QueueCancelled + from ..operation_queue import QueueCancelled, QueueUnavailable from ..session_record import library_available, library_wait_reason try: if self.runner is run_management_batch: def item(request, action): - return self.native_queue.run(action, stop=context.stop, context=context, + return self.native_queue.run(action, stop=context.stop, context=context, skip_unavailable=True, wait_state=lambda: library_wait_reason(request.library), waiting=lambda: self._emit(context, 'progress',{'stage': 'waiting_native_slot', 'retained': not library_available(request.library), @@ -206,11 +206,15 @@ class ManagementDialog(QDialog): return self.runner(requests, adapter=self.adapter, stop=context.stop, progress=lambda event:self._emit(context, 'progress',event), item_executor=item, version_prompt=lambda choice:self._emit(context, 'choice',choice), context=context) - return self.native_queue.run(action, stop=context.stop, context=context, waiting=lambda: self._emit(context, 'progress', + return self.native_queue.run(action, stop=context.stop, context=context, skip_unavailable=True, waiting=lambda: self._emit(context, 'progress', {'stage': 'waiting_native_slot', 'retained': not library_available(self.template.library), 'detail': library_wait_reason(self.template.library) or '已排队,等待当前检查结束'}), wait_state=lambda: library_wait_reason(self.template.library)) + except QueueUnavailable as error: + from ..management import ManagementResult + return [ManagementResult(r.operation, r.library, r.name, r.partition, r.source, r.auto_verify, + 'admission', 'SKIPPED', True, str(error)) for r in requests] except QueueCancelled as error: from ..operation_queue import TaskHandoff from ..management import ManagementResult diff --git a/src/cbb_refresh_verify/verify_runner.py b/src/cbb_refresh_verify/verify_runner.py index dbc8da9..4332bd3 100644 --- a/src/cbb_refresh_verify/verify_runner.py +++ b/src/cbb_refresh_verify/verify_runner.py @@ -1505,7 +1505,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run def run_batch(requests, max_workers=1, verifier=None, *, stop=None, progress=None, item_executor=None, context=None): - """Run serially and stop when database/session safety is unconfirmed.""" + """Run serially; isolate failures and skip writes to resources still retained.""" if max_workers != 1: raise ValueError('Only serial Verify is supported for the shared Library Manager session') if context is not None: @@ -1535,7 +1535,9 @@ def run_batch(requests, max_workers=1, verifier=None, *, stop=None, progress=Non or context is not None and context.stop.is_set()): result = VerifyResult('SKIPPED', stderr='队列已停止,未操作此 CBB') elif library_keys.intersection(retained_libraries): - result = VerifyResult('SKIPPED', stderr='同库原生会话尚未释放,未启动新的写入') + previous, index = retained_libraries[next(iter(library_keys.intersection(retained_libraries)))] + result = VerifyResult('SKIPPED', error_category='PREVIOUS_SESSION_UNRELEASED', + error_stage='admission', stderr=f'前项 {getattr(previous, "block_name", previous)} 的同库会话尚未释放,当前项未启动。') else: try: def execute(): @@ -1546,9 +1548,11 @@ def run_batch(requests, max_workers=1, verifier=None, *, stop=None, progress=Non return result result = item_executor(request, execute) if item_executor is not None else execute() except Exception as error: - from .operation_queue import QueueCancelled, TaskHandoff + from .operation_queue import QueueCancelled, QueueUnavailable, TaskHandoff # An unexpected exception cannot establish database safety. - result = (_handoff_verify_result(error) if isinstance(error, TaskHandoff) else + result = (VerifyResult('SKIPPED', stderr=str(error), error_category='NATIVE_SESSION_PENDING', + error_stage='admission') if isinstance(error, QueueUnavailable) else + _handoff_verify_result(error) if isinstance(error, TaskHandoff) else VerifyResult('CANCELLED' if isinstance(error, QueueCancelled) else 'FAIL', stderr=str(error), safe_to_continue=isinstance(error, QueueCancelled))) results.append(result) diff --git a/tests/test_batch_exception_isolation.py b/tests/test_batch_exception_isolation.py new file mode 100644 index 0000000..ed66aff --- /dev/null +++ b/tests/test_batch_exception_isolation.py @@ -0,0 +1,248 @@ +"""An item failure must not strand a batch or masquerade as ICDB damage.""" +from dataclasses import replace +from threading import Event + +import pytest + +from cbb_refresh_verify import management, operation_lifecycle, session_record +from cbb_refresh_verify.operation_queue import BatchTaskContext, NativeQueue +from cbb_refresh_verify.verify_runner import VerifyRequest, VerifyResult, run_batch + + +def test_bulk_admission_skips_live_observer_without_starting_or_cancelling(tmp_path, monkeypatch): + from test_live_observer_queue import observed + library, _ = observed(tmp_path, monkeypatch) + queue = NativeQueue() + context = BatchTaskContext(str(library)) + calls = [] + with pytest.raises(RuntimeError, match='NATIVE_SESSION_PENDING'): + queue.run(lambda: calls.append('unexpected'), context=context, skip_unavailable=True) + assert not calls and not queue.pending and not queue.active + assert not context.stop.is_set() + assert queue.run(lambda: 'other library', context=BatchTaskContext(str(tmp_path/'other.lmc')), + skip_unavailable=True) == 'other library' + assert not session_record.library_available(library, live_only=True) + + +@pytest.mark.parametrize('kind', ['verify', 'management']) +def test_pre_admission_busy_is_one_skip_not_a_retained_or_cancelled_batch(tmp_path, monkeypatch, kind): + from test_live_observer_queue import observed + library, state = observed(tmp_path, monkeypatch) + queue = NativeQueue() + calls = [] + def item(req, action): + path = req.lmc_file if kind == 'verify' else req.library + context = BatchTaskContext(str(path)) + try: + return queue.run(action, context=context, skip_unavailable=True) + finally: + # The original observer finishes between submitted targets. + state['status'] = 'RELEASED' + if kind == 'verify': + def execute(req): + calls.append(req.block_name) + return VerifyResult('PASS') + results = run_batch([VerifyRequest(library, name, tmp_path) for name in ('Busy', 'Good')], + verifier=execute, item_executor=item) + else: + def execute(req, **kwargs): + calls.append(req.name) + return management.ManagementResult(req.operation, req.library, req.name, req.partition, + req.source, req.auto_verify, 'complete', 'REMOVED', True) + monkeypatch.setattr(management, 'run_management', execute) + results = management.run_management_batch([ + management.ManagementRequest('remove', library, name) for name in ('Busy', 'Good')], + item_executor=item) + assert [r.status for r in results] == ['SKIPPED', 'PASS' if kind == 'verify' else 'REMOVED'] + assert all(r.safe_to_continue for r in results) + assert calls == ['Good'] + assert 'NATIVE_SESSION_PENDING' in (results[0].stderr if kind == 'verify' else results[0].detail) + + +@pytest.mark.parametrize('released', [True, False]) +def test_management_rechecks_original_owner_and_preserves_failure(tmp_path, monkeypatch, released): + library = tmp_path/'lib.lmc' + requests = [management.ManagementRequest('remove', library, name) for name in ('Bad', 'Next')] + failed = management.ManagementResult('remove', library, 'Bad', 'Logical-Physical', None, + True, 'complete', 'RECOVERY_REQUIRED', False, 'original failure', tmp_path/'result.json') + checks, calls = [], [] + def recheck(lib, block, result, **kwargs): + assert lib == library and block == 'Bad' and result.name == 'Bad' + checks.append(block) + return replace(result, safe_to_continue=True) if released and len(checks) > 1 else result + def execute(req, **kwargs): + calls.append(req.name) + return failed if req.name == 'Bad' else replace(failed, name=req.name, status='REMOVED', safe_to_continue=True) + monkeypatch.setattr(operation_lifecycle, 'recheck_failed_release', recheck) + monkeypatch.setattr(management, 'run_management', execute) + results = management.run_management_batch(requests) + assert checks == ['Bad', 'Bad'] + assert calls == (['Bad', 'Next'] if released else ['Bad']) + assert results[0].status == 'RECOVERY_REQUIRED' and results[0].detail == 'original failure' + assert results[0].safe_to_continue is released + if not released: + assert 'Bad' in results[1].detail and results[1].stage == 'admission' + + +def test_management_unexpected_item_exception_keeps_independent_targets(tmp_path, monkeypatch): + libraries = [tmp_path/'same.lmc', tmp_path/'same.lmc', tmp_path/'other.lmc'] + requests = [management.ManagementRequest('remove', library, name) + for library, name in zip(libraries, ('Crash', 'Same', 'Other'))] + calls = [] + def execute(req, **kwargs): + calls.append(req.name) + if req.name == 'Crash': + raise OSError('unexpected evidence disk failure') + return management.ManagementResult(req.operation, req.library, req.name, req.partition, + None, True, 'complete', 'REMOVED', True) + monkeypatch.setattr(management, 'run_management', execute) + results = management.run_management_batch(requests) + assert [r.status for r in results] == ['RECOVERY_REQUIRED', 'SKIPPED', 'REMOVED'] + assert not results[0].safe_to_continue + assert 'BATCH_ITEM_EXCEPTION' in results[0].detail + assert calls == ['Crash', 'Other'] + + +@pytest.mark.parametrize('released', [True, False]) +def test_icdb_rechecks_failed_owner_before_next_target(qtbot, tmp_path, monkeypatch, released): + from cbb_refresh_verify.ui.icdb_check_task import IcdbCheckTask + library = tmp_path/'lib.lmc' + checks, calls = [], [] + failed = VerifyResult('FAIL', stderr='original database load error', safe_to_continue=False, + evidence_path=tmp_path/'result.json', error_category='MENTOR_DATABASE_LOAD_FAILED') + def execute(req): + calls.append(req.block_name) + return failed if req.block_name == 'Bad' else VerifyResult('CHECKED') + def recheck(lib, block, result, **kwargs): + assert lib == library and block == 'Bad' and result is failed + checks.append(block) + return replace(result, safe_to_continue=True) if released and len(checks) > 1 else result + monkeypatch.setattr(operation_lifecycle, 'recheck_failed_release', recheck) + task = IcdbCheckTask([VerifyRequest(library, name, tmp_path) for name in ('Bad', 'Next')], + NativeQueue(), tmp_path/'reports', verifier=execute) + task.start() + qtbot.waitUntil(lambda: not task.active, timeout=5000) + assert checks == ['Bad', 'Bad'] + assert calls == (['Bad', 'Next'] if released else ['Bad']) + assert task.results[0].status == 'FAIL' and task.results[0].safe_to_continue is released + if not released: + assert 'Bad' in task.results[1].stderr + assert task.results[1].error_category == 'PREVIOUS_SESSION_UNRELEASED' + + +def test_icdb_live_observer_finishes_batch_without_cancel_button(qtbot, tmp_path, monkeypatch): + from test_live_observer_queue import observed + from cbb_refresh_verify.ui.icdb_check_task import IcdbCheckTask + library, _ = observed(tmp_path, monkeypatch) + calls = [] + task = IcdbCheckTask([VerifyRequest(library, name, tmp_path) for name in ('A', 'B')], + NativeQueue(), tmp_path/'reports', + verifier=lambda req: calls.append(req.block_name) or VerifyResult('CHECKED')) + task.start() + try: + qtbot.waitUntil(lambda: not task.active, timeout=1500) + assert [r.status for r in task.results] == ['SKIPPED', 'SKIPPED'] + assert all(r.safe_to_continue and r.error_category == 'NATIVE_SESSION_PENDING' for r in task.results) + assert not calls and not task.stop.is_set() + finally: + task.cancel() + qtbot.waitUntil(lambda: not task.active, timeout=3000) + + +def test_cancel_has_priority_over_busy_admission(tmp_path, monkeypatch): + from test_live_observer_queue import observed + from cbb_refresh_verify.operation_queue import QueueCancelled + library, _ = observed(tmp_path, monkeypatch) + context = BatchTaskContext(str(library)) + context.cancel() + with pytest.raises(QueueCancelled): + NativeQueue().run(lambda: pytest.fail('cancelled action dispatched'), + context=context, skip_unavailable=True) + + +def test_cancel_during_release_recheck_preserves_original_result(tmp_path): + stop = Event() + stop.set() + failed = VerifyResult('FAIL', safe_to_continue=False, evidence_path=tmp_path/'result.json') + result = operation_lifecycle.recheck_failed_release(tmp_path/'lib.lmc', 'Bad', failed, stop=stop) + assert result is failed + + +def test_broken_management_progress_sink_does_not_abort_completed_items(tmp_path, monkeypatch): + requests = [management.ManagementRequest('remove', tmp_path/'lib.lmc', name) for name in ('A', 'B')] + def execute(req, **kwargs): + return management.ManagementResult(req.operation, req.library, req.name, req.partition, + None, True, 'complete', 'REMOVED', True) + def disconnected(event): + raise RuntimeError('UI receiver deleted') + monkeypatch.setattr(management, 'run_management', execute) + results = management.run_management_batch(requests, progress=disconnected) + assert [r.status for r in results] == ['REMOVED', 'REMOVED'] + + +def test_verify_ui_busy_admission_reports_each_skip_and_remains_usable(qtbot, tmp_path, monkeypatch): + from test_ui_filters import load_window + window = load_window(qtbot, tmp_path, monkeypatch, + verifier=lambda req: pytest.fail('live observer must prevent native launch')) + library = window.mentor_lmc_path or window.loaded_path + # Preserve the real admission/Qt paths; only emulate the cached native observer. + from types import SimpleNamespace + monkeypatch.setattr(session_record, '_retained_libraries', {'owned':{session_record._library_key(library)}}) + monkeypatch.setattr(session_record, '_retained_results', {'owned':{'status':'ACTIVE'}}) + monkeypatch.setattr(session_record, '_observers', {'owned':(SimpleNamespace(is_alive=lambda:True),None)}) + window._run(['Beta', 'Gamma']) + try: + qtbot.waitUntil(lambda: not window.busy, timeout=2500) + assert window.search_edit.isEnabled() + reports = list((tmp_path/'reports').glob('batch-*.log')) + assert reports + text = reports[0].read_text(encoding='utf-8') + assert text.count('NATIVE_SESSION_PENDING') >= 2 + assert 'CANCELLED' not in text and 'PREVIOUS_SESSION_UNRELEASED' not in text + assert window.status_label.text().startswith('已结束:') + finally: + window.stop.set() + window.native_queue.wake() + qtbot.waitUntil(lambda: not window.busy, timeout=3000) + + +@pytest.mark.parametrize('kind', ['backup', 'management']) +def test_dialog_busy_before_dispatch_never_claims_own_unreleased_session(qtbot, tmp_path, monkeypatch, kind): + from test_live_observer_queue import observed + from cbb_refresh_verify.ui import timed_prompt + from PySide6.QtWidgets import QMessageBox + library, _ = observed(tmp_path, monkeypatch) + monkeypatch.setattr(timed_prompt, 'question', lambda *a, **kw: QMessageBox.Yes) + results = [] + if kind == 'backup': + from cbb_refresh_verify.ui.backup_recovery_dialog import BackupRecoveryDialog + dialog = BackupRecoveryDialog(('A',), lambda name: VerifyRequest(library, name, tmp_path), + recoverer=lambda *a, **kw: pytest.fail('blocked recovery dispatched')) + source=tmp_path/'A.prj'; source.touch() + dialog.source_edit.setText(str(source)) + dialog.completed.connect(lambda name,result: results.append(result)) + button=dialog.restore_button + else: + from cbb_refresh_verify.ui.management_dialog import ManagementDialog + dialog = ManagementDialog([management.ManagementRequest('remove',library,'A')], + runner=lambda *a,**kw: pytest.fail('blocked management dispatched')) + dialog.completed.connect(results.extend) + button=dialog.execute_button + qtbot.addWidget(dialog) + dialog.native_queue=NativeQueue() + button.click() + qtbot.waitUntil(lambda: not dialog.busy, timeout=2500) + assert len(results)==1 and results[0].status=='SKIPPED' and results[0].safe_to_continue + + +def test_pre_admission_error_does_not_retain_a_path_lease(qtbot, tmp_path, monkeypatch): + from test_ui_filters import load_window + from cbb_refresh_verify.operation_queue import QueueUnavailable + window=load_window(qtbot,tmp_path,monkeypatch) + from types import SimpleNamespace + window.library_lease=SimpleNamespace() + retained=[] + monkeypatch.setattr(window,'_retain_path_lease',lambda *a,**kw: retained.append(a)) + window._failed(QueueUnavailable('lib.lmc')) + window.library_lease=None + assert not retained diff --git a/tests/test_diagnostic_open.py b/tests/test_diagnostic_open.py index 72624fb..ace17a5 100644 --- a/tests/test_diagnostic_open.py +++ b/tests/test_diagnostic_open.py @@ -122,6 +122,26 @@ def test_persistent_loading_progress_keeps_deadline_and_never_closes(diagnostic, assert Session.instances[-1].posted == [] +def test_cancel_from_window_scan_wins_expired_open_deadline(diagnostic, job, monkeypatch): + job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job) + write_logs(job) + signal = Path(job['root']).parent/'cancel-after-scan' + job['cancel_signal'] = str(signal) + clock = [0.0] + monkeypatch.setattr(diagnostic.time, 'monotonic', lambda: clock[0]) + monkeypatch.setattr(diagnostic, '_NativeSession', Session) + target = frame(job) + target['children'].append({'hwnd':13,'class':'msctls_progress32','text':'','visible':True}) + def windows(pid): + signal.touch() + clock[0] = 10.0 + return [target] + monkeypatch.setattr(diagnostic, '_windows', windows) + with pytest.raises(RuntimeError, match='VERIFY_CANCELLED'): + diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None) + assert Session.instances[-1].posted == [] + + def test_diagnostic_waits_for_startup_forward_no_before_close(diagnostic, job, monkeypatch): job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job) write_logs(job); job['timeout'] = 1