fix(photon): repair two cross-PR collisions from the photon wave (U+FFFC shadow + runtime-record fixture) - #73773
Closed
teknium1 wants to merge 2 commits into
Closed
fix(photon): repair two cross-PR collisions from the photon wave (U+FFFC shadow + runtime-record fixture)#73773teknium1 wants to merge 2 commits into
teknium1 wants to merge 2 commits into
Conversation
… handler The #73560 cherry-pick of #54514 (drop placeholder text at the boundary, fd4f756) landed after the deferred-wait implementation (6b91b50) and its early return made the _pending_fffc wait/timeout branch unreachable — breaking 4 tests on main (CI slice 2/8 red for every PR). The deferred-wait branch subsumes the drop's intent: the placeholder is still never dispatched as a text turn, and we additionally hold a timeout so the real attachment can cancel it. The drop-commit's regression test still passes unchanged. Credit: placeholder-drop originally by @kelsia14 (#54514); deferred-wait by the #71673 salvage.
alt-glitch
added
type/bug
Collaborator
…ture Second cross-PR collision from the same wave: 9cf2046 hardened sidecar_deps_installed() to probe node_modules/spectrum-ts (not bare node_modules/), and the later-merged runtime-record tests (e79d316) still created only node_modules/ — so _start_sidecar raised the deps-not-installed error before the code under test ran (CI slice 7/8 red on main). Fixture now creates the dir the probe checks.
teknium1
changed the title
Contributor
૮ >ﻌ< ა ci reviewran on f01c938 all good! |
Contributor
Author
|
Superseded — Teknium landed the identical fix directly on main in ceaa788 (adapter change byte-identical, fixture fix equivalent). Closing; nothing left to salvage. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Restores main's red CI — two independent cross-PR collisions from yesterday's photon wave: (1) slice 2/8, 4 tests — the #73560 cherry-pick of #54514's early U+FFFC drop landed after the deferred-wait handler and its early
returnmade the_pending_fffcbranch unreachable; (2) slice 7/8, 2 tests — 9cf2046 hardenedsidecar_deps_installed()to probenode_modules/spectrum-ts, and the later-merged runtime-record tests (e79d316) still created only barenode_modules/, so_start_sidecarraised deps-not-installed before the code under test ran.Root cause
Two independent fixes for the same iMessage placeholder bug merged in sequence: the deferred-wait implementation (6b91b50,
_pending_fffc+ 15s timeout + cancel-on-attachment) and later the boundary drop (fd4f756, early return on\ufffc). The drop sits earlier in_dispatch_inbound, so the wait branch — and its 4 regression tests — became dead code.Changes
plugins/platforms/photon/adapter.py: remove the early drop block. The deferred-wait branch subsumes its intent — the placeholder is still never dispatched as a text turn, and the pending timeout lets the real attachment cancel cleanly. The drop's own regression test still passes unchanged.tests/plugins/platforms/photon/test_runtime_record.py: spawn fixture materializesnode_modules/spectrum-ts(the dir the hardened probe checks) instead of barenode_modules/.Validation
tests/plugins/platforms/photon/test_inbound.pytests/plugins/platforms/photon/test_runtime_record.pytests/plugins/platforms/photon/Credit: placeholder drop originally by @kelsia14 (#54514); deferred wait from the #71673 salvage.
Infographic