Skip to content

fix(test): reconcile #11960's tests with the one-store memory refactor - #12098

Closed
bolichen97 wants to merge 1 commit into
mainfrom
fix/main-after-11960
Closed

bolichen97 wants to merge 1 commit into
mainfrom
fix/main-after-11960

Conversation

@bolichen97

Copy link
Copy Markdown
Contributor

Why

#11960 (6c21f0d4d9) was authored against a base older than the member memory refactor bc0d2b0cfc and merged after it. The merge was textually clean but the test tree it carried is semantically stale, so every PR on main now fails three required lanes (reproduced on the pure revert #12091 and on #11996, both red on exactly these):

  • Backend Tests (3.12, 1) and the Windows twin: test/test_subagent_continuable.py is feat(acp): continue a codex subagent from its persisted thread #11960's copy of the file, which dropped the refactor's adjustments and monkeypatches kiro_crew.member_memory_auth.private_memory_execution_supported, a function the refactor removed. 60 errors and 34 failures; 6c21f0d4d9^ passes all 167.
  • Backend Tests (3.12, 6): test/test_real_adapter_gate.py::test_the_tree_carries_the_guarded_tests_this_lane_exists_for fails because the codex real adapter tests lost their @pytest.mark.real_adapter markers and the require_real_adapter guard.
  • Real Adapter Contract Tests: the lane selects on that marker and now finds 1 of the measured floor of 4.

What changed

No production code is touched.

Tests

  • test_subagent_continuable.py, test_real_adapter_gate.py, test_codex_session_mcp.py, test_opencode_session_mcp.py: 315 passed, 5 skipped locally.
  • pytest -m real_adapter --collect-only test/test_codex_session_mcp.py test/test_opencode_session_mcp.py: 4 selected (the lane's floor).
  • black baseline, isort, flake8 on the two files: pass.

Pattern harvest

Rule candidate: CI
Pattern: a PR whose CI ran against an older base merges textually clean over a refactor that changed the API its tests rely on. The main push pipeline runs no backend shards, so the breakage stays green until the next PR. Second instance this week (#11947 was the first, reverted in #12091). Candidate rule: require the PR's checks to have run against the current base before merge (a mergeable_state freshness check), or an import and collection smoke on push to main.

#11960 (6c21f0d) was authored against a base older than the member
memory refactor bc0d2b0 and merged after it with a textually clean
but semantically stale test tree, so every PR on main now fails three
required lanes:

- Backend shard 1: test_subagent_continuable.py carried #11960's copy
  of the file, which dropped the refactor's adjustments and monkeypatched
  kiro_crew.member_memory_auth.private_memory_execution_supported, a
  function the refactor removed (60 errors, 34 failures).
- Backend shard 6 and Real Adapter Contract Tests: the codex real
  adapter tests lost their @pytest.mark.real_adapter markers and the
  require_real_adapter guard, so the lane selected 1 of the 4 measured
  contracts and test_real_adapter_gate.py failed.

Three-way merge of the test file (base bc0d2b0^, refactor side,
#11960 side): the refactor's version plus #11960's appended
TestSharedBindIdentityLabel, whose MagicMock handle now carries a real
privacy mode. Codex tests get their markers and the _require_codex_acp
wrapper back; the token-spending opt-in test stays unmarked with an
inline skip so the lane's no-skip assertion holds.
@bolichen97
bolichen97 requested review from a team and Zedmor September 19, 2026 21:29
@github-actions github-actions Bot added the readiness: checking Automated validation is still running label Sep 19, 2026
@bolichen97

Copy link
Copy Markdown
Contributor Author

Superseded by #12088, which reverts #11960 outright and landed first. Closing without merge.

@bolichen97 bolichen97 closed this Sep 19, 2026
@github-actions github-actions Bot removed the readiness: checking Automated validation is still running label Sep 19, 2026
@bolichen97
bolichen97 deleted the fix/main-after-11960 branch September 19, 2026 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant