test(close-merged-issues): read the open-request queue from the file, not a literal (#1963) #1967
No reviewers
Labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
jaylouisw/packetforge!1967
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "fix/1118-0936"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Fixes #1963
The real-catalogue block in
test/close-merged-issues.test.jshardcoded a snapshot of the open[Device]:queue and asserted that none of it was indevices/. Any PR that answers a request necessarily broke it: #1962 (E9612) failed with[#808], #1934 with[#810, #808, #807]; #1955 only passed because it deleted[807, ...]from the literal in the same commit. The guard made "correctly modelling a device" indistinguishable from "regressing the sweep".Wrong: lines 306-317 listed six issues by hand (two of them, #742/#743, already closed) and the assertion message counted "the six open requests" regardless of how many the literal held.
Changed:
research/open-device-requests.json, the filescripts/check-closed-issues.jsandscripts/regen-registry-doc.jsalready treat as the record of open requests, with a shape check (issue, models, missing, no duplicates);Reproduction: with #1962's
devices/huawei/optixtrans-e9612.jsonstaged on this branch, the old test failed72 passed, 1 failed(none of the six open requests ... [#808]). After the change the same tree gives78 passed, 0 failed, and main without that spec also gives78 passed, 0 failed.Note for the device stream: this makes #1962's own edit to the same block unnecessary; that PR will conflict here and should take this side (its E9612 spec and registry-doc edits are untouched).
Gates:
node scripts/syntax-check.js— 411 files, all OK.node test/close-merged-issues.test.js— 78 passed, 0 failed (both with and without the E9612 spec).node test/closed-issues-audit.test.js— 36 passed, 0 failed;node test/catalogue-hygiene.test.js— 25 passed, 0 failed. Test-only change, engine/cli untouched.This branch conflicts with
main, so it was not rebased:A conflict is a decision about behaviour rather than a mechanical fix, so this is left for a human. Rebasing by hand and force-pushing will let the automation pick it up again.
Verified green, blocked on one hunks-worth of overlap with main — and the overlap is with a block that landed two minutes ago.
Head
f0ec108a: 8/8 checks success, Node 18/20/22 all green.mergeable=falseis real, not "not computed yet": mergingorigin/main(23098286) into this branch in a scratch worktree gives exactly one conflict,test/close-merged-issues.test.jslines 307-380.Why it is no longer a clean rebase.
3f58050a(#1962, merged 09:41 today) landed with the hardcoded block already rewritten by another stream —#808deleted from the literal, "six"→"five", and explicit E9605/E9612deviceMatchassertions added. This branch deletes that whole block and replaces it with the queue-file read plus the generic drift loop. Same 50 lines, two incompatible rewrites.Why I did not resolve it. Two things make it a decision, not a mechanical merge:
answeredis an array on this branch and a single match object on main's side, so "keep both sides" needs a rename plus a choice about whether main's E9612 assertion survives.research/open-device-requests.jsonnow lists only #130, #803, #810 — #807/#808 were removed when they landed — so the generic drift loop no longer covers E9612 at all. Taking this branch's side silently drops the E9612 near-miss assertion that is on main as of this morning.test/is Jay's, and dropping a just-merged assertion is a coverage decision.Two clean resolutions, either is fine by me:
hits) and appending the two explicitdeviceMatchassertions after the loop;Still live on main: the literal in the test on
mainis unchanged in spirit, so any device PR that answers #810, #803 or #130 turns it red. #1934 (E9624/#810) is that failure right now — the guard is not fixed until this lands.No force-push from me;
fix/1118-0936is your loop's branch.f0ec108a1176389e43e4This branch conflicts with
main, so it was not rebased:A conflict is a decision about behaviour rather than a mechanical fix, so this is left for a human. Rebasing by hand and force-pushing will let the automation pick it up again.
76389e43e4145e3002d4