Skip to content

test(mcp): replace the fixed wait in test_mcp_apply with await_until - #20114

Merged
javenciu merged 1 commit into
mainfrom
test/wait-discipline-mcp-apply
Oct 14, 2026
Merged

javenciu merged 1 commit into
mainfrom
test/wait-discipline-mcp-apply

Conversation

@javenciu

@javenciu javenciu commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Problem / Motivation

Goal: Short fixed waits in 1 test file are replaced by waits on the signal they were polling for, so a slow CI runner can no longer turn them red.

The wait-discipline ratchet counts, per file, the sites the repo still tolerates. This PR retires: 1 test_mcp_apply.py.

Why it matters

A fixed wait_for(..., timeout=N) is a bet on the runner's speed: on a loaded shard the event arrives after N and the test fails for a reason unrelated to the code under test. The repo tracks these sites per file in test/wait_discipline_baseline.txt and the ratchet lets each count only go down; retiring them is how the suite gets quieter.

Not a goal

  • Files whose counted sites are polling sleeps (those need a different helper and a judgement call).
  • Any refactor or reformatting of untouched lines.
  • Raising or adding a baseline entry (the ratchet only tightens).

What changed (motivation → approach → change)

Each site below replaced asyncio.wait_for(<signal>, timeout=N) with await_until from kiro_crew.testing.wait, which waits on the same signal with the suite's lost-run ceiling instead of a per-site bet.

  • test/test_mcp_apply.py: await _asyncio.wait_for(done_confirmed.wait(), timeout=10)
  • test/wait_discipline_baseline.txt: removed 1 test_mcp_apply.py.

Backwards compatibility

Compatible: test-only change
Removes nothing: a baseline entry is a tolerance the gate stops needing, not a capability.

Tests

  • Deleting the baseline line with the test file untouched: test/test_wait_discipline_ratchet.py fails (1 failed, 38 passed), proving the gate still counts the old site.
  • With the edit: the ratchet and the touched file pass together, run with -W error::RuntimeWarning so every replaced wait is proven awaited; the file's own pass count is unchanged.
  • flake8 clean on the touched file; the repo's baselined black gate passes.

Manual verification

N/A — unit coverage sufficient: the gate and the file's own tests exercise the changed lines directly.

Screenshots / video

Why no screenshot: nothing renders; this change touches test code and a CI baseline only.

No issue exists; burn-down of the wait-discipline ratchet baseline (precedents #19928, #20014, #19527).

@javenciu
javenciu requested review from a team and KiroCrewCaptain as code owners October 14, 2026 04:43
@javenciu
javenciu requested a review from mbriones98 October 14, 2026 04:43
@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

UX Review (Opus 5.5) — ⏭️ skipped

Revision 8f5322858515ea3a85cdf4441b144208c486342d touches no user-facing surface (no changes under website/ or committed screenshots), so the UX review was skipped. Advisory — does not block merge.

@github-actions github-actions Bot added the readiness: action required A blocking check or review needs attention label Oct 14, 2026
@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

First Principles Review (Opus 5.5) — ⏭️ skipped

Revision 8f5322858515ea3a85cdf4441b144208c486342d ships no reviewable capability (docs, tests or generated files only), so there is nothing to inventory. Advisory — does not block merge.

@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Design Review (Opus 5.5) — ✅ PASS

Design-level review of 8f5322858515ea3a85cdf4441b144208c486342d — updated in place on each push. A BLOCK verdict blocks PR readiness; PASS/CONCERNS are advisory.

Design-Verdict: PASS

Check the except _asyncio.TimeoutError guard: await_until raises AssertionError when it times out, so task.cancel() and the precondition pytest.fail can no longer run.

[DESIGN-REVIEWED] 8f53228

Description read

[DESCRIPTION-READ] fa316baf8927a7fab050acadafc9edc0e1dfadba9df58b408da5de7dc472671e

That sha256 names everything this verdict read: the PR description, plus the 1 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with .github/scripts/pr-description-capture.sh over the same inputs; if it differs, the description or that evidence changed after this verdict was formed and any finding drawn from either is unproven.

@github-actions github-actions Bot added readiness: checking Automated validation is still running and removed readiness: action required A blocking check or review needs attention labels Oct 14, 2026
@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Opus 5.5 Review — ✅ no blocking findings

Reviewed 8f5322858515ea3a85cdf4441b144208c486342d — this comment is updated in place on each push.

Review details

One advisory finding; nothing blocks the merge.

FINDING — test/test_mcp_apply.py:1358 — await_until signals an expired bound by raising AssertionError, not asyncio.TimeoutError (_signal_failure returns AssertionError), so the except _asyncio.TimeoutError: handler can never run. If done is never confirmed, task.cancel() is skipped and the api_mcp_apply task is left pending. The "Phase 1 never confirmed 'done'" precondition message is lost too. → Fix: change the handler to except AssertionError:, or drop the try/except, cancel task in a finally, and put the precondition wording in what=.

[OPUS-REVIEWED] 8f53228

Verdict parsed from the review's SHA-scoped output markers for commit 8f5322858515ea3a85cdf4441b144208c486342d.

False positive or not applicable? A repository writer can comment:
/ai-review override fable 8f5322858515ea3a85cdf4441b144208c486342d: <one-sentence reason>

@github-actions

github-actions Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

GPT 6.1 Review — ✅ no blocking findings

GPT 6.1 completed its review of 8f5322858515ea3a85cdf4441b144208c486342d and found no blocking issues.

This comment is updated in place on each push.

Review details

No findings.
[GPT-REVIEWED] 8f53228

False positive or not applicable? A repository writer can comment:
/ai-review override gpt 8f5322858515ea3a85cdf4441b144208c486342d: <one-sentence reason>

@javenciu

Copy link
Copy Markdown
Contributor Author

Closing and reopening so CI runs on hosted runners: same-repo runs from this account queue on the fleet label without a runner (details on #19683).

@javenciu javenciu closed this Oct 14, 2026
@javenciu javenciu reopened this Oct 14, 2026
@github-actions github-actions Bot added readiness: action required A blocking check or review needs attention readiness: checking Automated validation is still running readiness: passed Eligible automated validation passed for the current revision and removed readiness: checking Automated validation is still running readiness: action required A blocking check or review needs attention labels Oct 14, 2026
@javenciu
javenciu enabled auto-merge (squash) October 14, 2026 06:57

@KiroCrewCaptain KiroCrewCaptain left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tier 1 auto-approve: test (2 files). Criteria: no conflict, no requested changes, security path denylist clean, design-doc gate clean, security checklist all-NO, no reviewer-lane findings, readiness signal fresh for this head SHA, declared category matches the diff. Category: test-only change, replaces one fixed wait in test_mcp_apply with await_until and drops its wait-discipline baseline entry.

@javenciu
javenciu merged commit 90afeb8 into main Oct 14, 2026
119 of 188 checks passed
@javenciu
javenciu deleted the test/wait-discipline-mcp-apply branch October 14, 2026 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

readiness: passed Eligible automated validation passed for the current revision

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants