Repository navigation
Keep the runtime smoke test's shell off the machine's platform root - #15385
scottjones wants to merge 2 commits into
Conversation
The shell reads /usr/share/omarchy-platform at fixed paths, and the bar lays itself out around a camera cutout the platform describes there. Run on a MacBook with omarchy-mac installed, the test's shell found the panel's notch, laid the bar out beside it, and failed "runtime geometry keeps update before indicators". The test's copy of the shell now reads an empty fixture root instead, as platform_root_copy does for commands. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
|
Reviewed and verified on a worker VM, with this branch merged onto current The leak is real. I installed a The failure it names no longer happens on Tests: Second opinion: none. The configured reviewer, Codex Medium, answers, but omabot's review budget for the day was used up before this pull request, so only Claude Opus 5.5 has reviewed it. Codex Medium did agree on the classification, which is run separately. This now waits on the maintainer and a second review. Nothing is needed from you. |
|
Thanks for checking it on a worker. Agreed on the reclassification: since #15517 the named check passes either way, so I've updated the description to say this keeps the test on the same layout on a notched machine, and to mention |
quattro moved the smoke test's shell copy into setup_scratch_shell (omacom#16339), so the platform-root rewrite now runs on $SCRATCH_ROOT/shell right after it, with the fixture under $SCRATCH_DIR. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
This had stopped merging into Checked again on a worker VM, at the merged head. With a Two things on
Second opinion: Codex Medium and muse-wonder (via pi, thinking high) reviewed the merge. Both agreed the rewrite runs before the scratch shell starts, catches every reference to the platform root in the copy, and touches nothing outside the scratch directory. Both also agreed the geometry race was already on This is verified. It is not marked ready because the runtime smoke suite isn't green on a worker, for the |
[Low impact] The change affects only the runtime smoke test's shell copy. The PR appears safe to merge, with a non-blocking fix needed for temporary paths containing spaces. Findings
SummaryThe smoke test now rewrites platform paths in its copied shell to an empty fixture directory.
scottjones explicitly deferred a shared shell-copy helper to a follow-up because four tests copy the shell. scottjones also explicitly made no grep matches acceptable so removing the fixed platform path does not stop the test. Reviews (1) · Last reviewed commit: "Merge quattro into test/runtime-smoke-pl..." · Reviewed by Greptile |
| { grep -rlF /usr/share/omarchy-platform "$SCRATCH_ROOT/shell" || true; } | | ||
| xargs -r sed -i "s|/usr/share/omarchy-platform|$platform_root|g" |
There was a problem hiding this comment.
If TMPDIR contains a space, such as /tmp/test runs, every matching filename contains that space too. xargs splits these filenames, so sed fails and the test stops before starting the shell. Use grep -rlZF with xargs -0r to preserve complete filenames.
| { grep -rlF /usr/share/omarchy-platform "$SCRATCH_ROOT/shell" || true; } | | |
| xargs -r sed -i "s|/usr/share/omarchy-platform|$platform_root|g" | |
| { grep -rlZF /usr/share/omarchy-platform "$SCRATCH_ROOT/shell" || true; } | | |
| xargs -0r sed -i "s|/usr/share/omarchy-platform|$platform_root|g" |
runtime-smoke's copy of the shell reads/usr/share/omarchy-platformfrom the machine running the test:display-cutouts.json(shell/plugins/bar/Bar.qml) andaudio.json(shell/Commons/AudioNodes.qml). On a MacBook with a notch, the test's bar lays itself out around the cutout, so the test checks a different layout there than everywhere else.The test now rewrites that path in its shell copy to an empty fixture root, the same way
platform_root_copykeeps commands off the host's files. If the shell ever stops naming the platform root, the rewrite does nothing instead of stopping the test.When I opened this, the notched layout failed "runtime geometry keeps update before indicators". Since #15517 reworked the bar sections, that check passes on a notched Mac either way, so this is about the test checking the same layout on every machine, not a red result.
@maralcbr spotted that this still applied to
quattro, pointed it here from omacom#695, and suggested the|| trueon the grep. He also suggested a shared shell-copy helper. I've left that for a follow-up, since four tests copy the shell.Evidence
@omarchybot verified it on a worker with a 40-row cutout file: on
quattrothe bar dropped to y 7 and the clock moved beside the cutout (x 978 instead of 581). With this change the geometry matched a machine with no cutout file. Since the change is only these lines, reverting it brings the leak back.On an M2 Max (notched panel, real
display-cutouts.json),runtime-smokepasses 22/22 onquattro(5fcdaca) and with this change merged onto it.Merge Danger
Door: two-way
Blast Radius: test-only
🤖 Generated with Claude Code