Skip to content

Bind the vMCP test server's port directly #6044

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 27, 2026
+9 −17
Merged

Bind the vMCP test server's port directly #6044

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
26 changes: 9 additions & 17 deletions test/integration/vmcp/helpers/vmcp_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package helpers

import (
"context"
"net"
"testing"
"time"

Expand Down Expand Up @@ -122,25 +121,18 @@ func WithSessionTTL(ttl time.Duration) VMCPServerOption {
}
}

// getFreePort returns an available TCP port on localhost.
func getFreePort(tb testing.TB) int {
tb.Helper()

listener, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(tb, err, "failed to get free port")
defer func() { _ = listener.Close() }()

addr, ok := listener.Addr().(*net.TCPAddr)
if !ok {
tb.Fatalf("failed to get TCP address from listener")
}
return addr.Port
}

// NewVMCPServer creates a vMCP server for testing using the Serve path (core.New +
// Serve). The server is automatically started and ready when this function returns.
// Use functional options to customize behavior.
//
// The server binds an OS-assigned port (ServerConfig.Port is 0) and holds that
// listener for its lifetime, so callers MUST read the address back from the
// returned server's Address() rather than assuming a port. Address() reports the
// bound port only once the server is ready, which this function waits for before
// returning. Do not pre-select a port here by binding and closing a probe
// listener: that releases the port, and any of the parallel tests in this suite
// can claim it before the server rebinds (#6034).
//
// The Serve path is used (rather than the legacy server.New path) so that
// integration tests exercise the production code path that routes tool/resource
// calls through core.VMCP. This is required for testing per-request
Expand Down Expand Up @@ -197,7 +189,7 @@ func NewVMCPServer(
Name: "test-vmcp",
Version: "1.0.0",
Host: "127.0.0.1",
Port: getFreePort(tb),
Port: 0, // OS-assigned; see the note on NewVMCPServer
EndpointPath: "/mcp",
SessionTTL: 30 * time.Minute,
AuthMiddleware: auth.AnonymousMiddleware,
Expand Down
Loading