The review correctly identified that this PR includes the unrelated ICDB WIP ancestry. The replacement is based directly on main and contains only 4 desktop-fix files. This PR is closed without merging.
The original validation statement attributing test_backup_recovery failure to the baseline is withdrawn. Sequential full-suite checks now pass: main 471 passed; replacement 480 passed. Both have one pywinauto STA warning. The replacement also fixes test-interface fidelity and both reader lifecycle boundaries.
Superseded by #8 (https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/8).
The review correctly identified that this PR includes the unrelated ICDB WIP ancestry. The replacement is based directly on main and contains only 4 desktop-fix files. This PR is closed without merging.
The original validation statement attributing test_backup_recovery failure to the baseline is withdrawn. Sequential full-suite checks now pass: main 471 passed; replacement 480 passed. Both have one pywinauto STA warning. The replacement also fixes test-interface fidelity and both reader lifecycle boundaries.
abaishu0730
changed title from fix: release private desktop on worker launch failure to [Superseded] fix: release private desktop on worker launch failure2026-11-05 15:00:00 +08:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Superseded by #8 (#8).
The review correctly identified that this PR includes the unrelated ICDB WIP ancestry. The replacement is based directly on main and contains only 4 desktop-fix files. This PR is closed without merging.
The original validation statement attributing test_backup_recovery failure to the baseline is withdrawn. Sequential full-suite checks now pass: main 471 passed; replacement 480 passed. Both have one pywinauto STA warning. The replacement also fixes test-interface fidelity and both reader lifecycle boundaries.
审查结论:P0,不建议按当前形式合并
1. 合并范围(P0,阻塞)
本 PR 的 head
6327ad1的父提交是1acfbd6,即 #3 的 WIP 分支头。相对main实际包含 59 个提交、118 个文件、+15,837/−497;本提交自身只有 4 个文件、+137/−19。Gitea 当前显示mergeable=true,合并会把 #3 的整栈 WIP 带入main(#3 标注 draft,并写明“PR 保持 WIP,不合并发布”)。而 #7 的标题、描述和验证只覆盖桌面泄漏修复,容易误导合并者。建议:
maincherry-pick6327ad1单独开 PR;已实测无冲突,结果正好 4 文件 / +137/−19。codex/temp-issue-2-icdb-recovery,随 #3 验收后合并。2. 代码修复(通过)
DesktopWorker.__init__的构造期回滚覆盖 CreateDesktop / CreateJobObject / CreateProcess / thread.Close 四个失败点,顺序为“进程 → Job → Desktop”,原始异常保留;read_library_flag把pywinauto导入前移,消除所述泄漏。目标 4 个测试文件 33 passed;新增 2 个测试在父提交 2 failed、在 head 2 passed,确实能抓住原 bug。3. 测试保真度(P1)
tests/test_desktop_worker.py的 fakeHandle同时实现Close()和CloseDesktop(),Desktop 与 Job 共用。变异验证:把desktop_worker.py:114的self.job.Close()改成self.job.CloseDesktop()(真实 Job 句柄没有该方法),测试仍 1 passed。建议拆分FakeDesktop/FakeJob,只暴露正确方法并断言关闭顺序;补“进程已创建后失败”的TerminateProcess分支。4. 验证声明(P2)
git diff --check实际失败:mentor_adapter.py:1452-1454有 3 条 trailing whitespace(文件为 CRLF,仓库.gitattributes使用* -text)。git -c core.whitespace=cr-at-eol diff --check才能通过;文档中的“通过”不准确。test_backup_recovery.py::test_invalid_source_does_not_touch_target在 head / parent / main 均通过。请在作者环境复核并更新基线说明。5. 其他(P2)
read_library_flag的CreateDesktop(1457)到try(1463)之间仍有Path(library)等赋值;建议把 Desktop 创建放进try/finally。同类函数read_library_tree_image_map也有相同模式。审查基于
6327ad1的 4 文件增量;#3 的 118 文件未逐行审查。fix: release private desktop on worker launch failureto [Superseded] fix: release private desktop on worker launch failurePull request closed