Skip to content

fix(e2e): stabilize flaky provider suite ordering and zai requestCapture race#45

Merged
edelauna merged 1 commit into
mainfrom
feature/bot-pr-human-approvals-3hbkmkjic8h7h
Jun 7, 2026
Merged

fix(e2e): stabilize flaky provider suite ordering and zai requestCapture race#45
edelauna merged 1 commit into
mainfrom
feature/bot-pr-human-approvals-3hbkmkjic8h7h

Conversation

@roomote
Copy link
Copy Markdown
Contributor

@roomote roomote Bot commented May 9, 2026

Opened on behalf of Elliott de Launay. View the task or mention @roomote for follow-up asks.

What problem this solves

Fixes two intermittent e2e flakes observed together in CI:

Why this change was made

Both failures were timing/ordering-dependent — they passed on re-run with a different file order or timing. Rather than rely on luck, the fixes make the suite order deterministic and the assertion immune to async stragglers.

Changes

  • apps/vscode-e2e/src/suite/index.ts — sort test files so providers/ suites always run after all other suites (alphabetical within each bucket). Provider teardown state can no longer bleed into tool suites regardless of glob order.
  • apps/vscode-e2e/src/suite/providers/zai.test.ts — snapshot requestCapture.maxTokens immediately after waitUntilCompleted returns in both glm-5.1 and glm-5-turbo tests, before any straggling async calls can overwrite it.

User impact

No production code changed. CI e2e-mock job should no longer flake on these two failure modes.

Closes #512
Closes #514

@roomote roomote Bot added the roomote:auto-resolve-conflicts Allow Roomote to auto-resolve merge conflicts for this PR label May 9, 2026
@roomote
Copy link
Copy Markdown
Contributor Author

roomote Bot commented May 9, 2026

2 issues outstanding. Action required. See task

  • platform-unit-test (windows-latest) is still pending after the 10-minute review wait window. — dismissed: superseded by a fresh CI run for the latest commit.
  • Moving the draft-state triggers onto pull_request lets the PR branch redefine the approval gate and bypass the two-human-approval requirement.
  • platform-unit-test (windows-latest) is still pending after the 10-minute review wait window. — dismissed: the latest PR head completed this job successfully.
  • platform-unit-test (ubuntu-latest) is still pending after the 10-minute review wait window.
  • platform-unit-test (windows-latest) is still pending after the 10-minute review wait window.

Comment thread .github/workflows/bot-pr-human-approval.yml Outdated
@codecov
Copy link
Copy Markdown

codecov Bot commented May 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@edelauna edelauna marked this pull request as ready for review May 9, 2026 15:44
@edelauna edelauna requested a review from hannesrudolph as a code owner May 9, 2026 15:44
Comment thread .github/workflows/bot-pr-human-approval.yml Outdated
edelauna
edelauna previously approved these changes May 9, 2026
Copy link
Copy Markdown
Contributor

@edelauna edelauna left a comment

Choose a reason for hiding this comment

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

🤖

@edelauna edelauna force-pushed the feature/bot-pr-human-approvals-3hbkmkjic8h7h branch from 3c0a972 to 2b1c2bc Compare June 7, 2026 00:36
@edelauna edelauna changed the title [Chore] Require two human approvals for bot-created PRs fix(e2e): stabilize flaky provider suite ordering and zai requestCapture race Jun 7, 2026
@edelauna edelauna added this pull request to the merge queue Jun 7, 2026
Merged via the queue into main with commit a390c95 Jun 7, 2026
17 of 18 checks passed
@edelauna edelauna deleted the feature/bot-pr-human-approvals-3hbkmkjic8h7h branch June 7, 2026 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

roomote:auto-resolve-conflicts Allow Roomote to auto-resolve merge conflicts for this PR

Projects

None yet

1 participant