Skip to content

Deflake vMCP forwarding notification wait #5941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JAORMX merged 1 commit into from
Jul 23, 2026
Merged

Deflake vMCP forwarding notification wait #5941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkg/vmcp/server/forwarding_realbackend_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,13 @@ func newDownstreamClient(ctx context.Context, t *testing.T, vmcpURL string, with
// waitNotification blocks for a forwarded notification with the given method.
func (dc *downstreamClient) waitNotification(t *testing.T, method string) mcpmcp.JSONRPCNotification {
t.Helper()
deadline := time.After(5 * time.Second)
// Give the forwarded notification generous headroom: these are async,
// server-initiated messages relayed backend -> vMCP -> downstream, and under
// the full-suite parallel `-race` load on CI the round trip can take well over
// a second. The previous 5s deadline flaked (timed out) there while passing in
// milliseconds locally. Stay under the callers' 20s context so a genuine hang
// still fails cleanly rather than blocking to the context deadline.
deadline := time.After(15 * time.Second)
for {
select {
case n := <-dc.notifCh:
Expand Down
Loading