From 749e7d2d81b2012e6c3599312621bc5cf3fb7481 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 4 Sep 2026 09:07:04 +0000 Subject: [PATCH 1/2] test(cli): bind GitHub OAuth tests to loopback --- cli/server_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cli/server_test.go b/cli/server_test.go index b5ca20e70b6..e019ff088b8 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -426,7 +426,8 @@ func TestServer(t *testing.T) { args := []string{ "server", "--postgres-url", dbURL, - "--http-address", ":0", + // Match the client's loopback address to avoid overlapping wildcard listeners on macOS. + "--http-address", "127.0.0.1:0", "--access-url", "https://example.com", } if tc.githubClientID != "" { From 83c7a6770899e454aa52c74f3b13f3efcc56eafa Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Fri, 4 Sep 2026 09:16:55 +0000 Subject: [PATCH 2/2] test(cli): remove GitHub OAuth readiness retries --- cli/server_test.go | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/cli/server_test.go b/cli/server_test.go index e019ff088b8..a1d6a33e616 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -397,18 +397,6 @@ func TestServer(t *testing.T) { createUserPostRestart bool } - waitAuthMethods := func(t *testing.T, ctx context.Context, client *codersdk.Client, expected codersdk.GithubAuthMethod) codersdk.AuthMethods { - t.Helper() - - var authMethods codersdk.AuthMethods - testutil.Eventually(ctx, t, func(ctx context.Context) bool { - var err error - authMethods, err = client.AuthMethods(ctx) - return err == nil && authMethods.Github == expected - }, testutil.IntervalFast, "github auth method did not reach expected state: %+v", expected) - return authMethods - } - runGitHubProviderTest := func(t *testing.T, tc testCase) { t.Parallel() @@ -464,12 +452,11 @@ func TestServer(t *testing.T) { } client := codersdk.New(accessURL) - expectedGithubAuthMethod := codersdk.GithubAuthMethod{ - Enabled: tc.expectGithubEnabled, - DefaultProviderConfigured: tc.expectGithubDefaultProviderConfigured, - } - authMethods := waitAuthMethods(t, ctx, client, expectedGithubAuthMethod) - require.Equal(t, expectedGithubAuthMethod, authMethods.Github) + + authMethods, err := client.AuthMethods(ctx) + require.NoError(t, err) + require.Equal(t, tc.expectGithubEnabled, authMethods.Github.Enabled) + require.Equal(t, tc.expectGithubDefaultProviderConfigured, authMethods.Github.DefaultProviderConfigured) cancelFunc() select { @@ -490,8 +477,10 @@ func TestServer(t *testing.T) { client = codersdk.New(accessURL) ctx = testutil.Context(t, testutil.WaitLong) - authMethods = waitAuthMethods(t, ctx, client, expectedGithubAuthMethod) - require.Equal(t, expectedGithubAuthMethod, authMethods.Github) + authMethods, err = client.AuthMethods(ctx) + require.NoError(t, err) + require.Equal(t, tc.expectGithubEnabled, authMethods.Github.Enabled) + require.Equal(t, tc.expectGithubDefaultProviderConfigured, authMethods.Github.DefaultProviderConfigured) } for _, tc := range []testCase{