fix: increase commit assertion timeout for multi-turn E2E test#744
Merged
alishakawaguchi merged 1 commit intomainfrom Mar 23, 2026
Merged
fix: increase commit assertion timeout for multi-turn E2E test#744alishakawaguchi merged 1 commit intomainfrom
alishakawaguchi merged 1 commit intomainfrom
Conversation
In TestInteractiveAttributionMultiCommitSameSession, WaitFor can match stale pane content from the previous turn, causing AssertNewCommits to start its countdown before the agent begins the second commit. Extract AssertNewCommitsWithTimeout with configurable timeout and use 60s for the second-turn assertion to prevent flaky failures. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Entire-Checkpoint: efb0cc7a2701
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reduces flakiness in multi-turn interactive E2E attribution testing by making the “new commits observed” assertion timeout configurable and using a longer timeout for the second-turn commit check.
Changes:
- Added
AssertNewCommitsWithTimeoutto allow configurable polling timeouts when waiting for new commits. - Refactored
AssertNewCommitsto delegate to the new helper while preserving existing behavior/call sites. - Updated
TestInteractiveAttributionMultiCommitSameSessionto use a 60s timeout for the second commit assertion.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| e2e/testutil/assertions.go | Introduces a timeout-configurable commit polling assertion and refactors the existing helper to call it. |
| e2e/tests/attribution_test.go | Uses the new helper with a longer timeout to stabilize the second-turn commit assertion in the multi-commit interactive test. |
Soph
approved these changes
Mar 21, 2026
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
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
AssertNewCommitsWithTimeouthelper with configurable timeout toe2e/testutil/assertions.goAssertNewCommitsto delegate to the new helper (preserves all existing call sites)TestInteractiveAttributionMultiCommitSameSessionfor the second-turn commit assertion, fixing flaky failures whereWaitFormatches stale pane content from the previous turnTest plan
mise run fmt && mise run lint— passedmise run test:e2e:canary— vogon passedmise run test:e2e --agent opencode TestInteractiveAttributionMultiCommitSameSession— passed (46.4s)🤖 Generated with Claude Code