Revert "chore(cli): fix test flake in TestExpMcpServer"

johnstcn · johnstcn · commit 90ad6fd8739f · 2025-05-12T16:37:09.000+01:00
This reverts commit 12405ae.
diff --git a/cli/exp_mcp_test.go b/cli/exp_mcp_test.go
@@ -133,35 +133,29 @@ func TestExpMcpServer(t *testing.T) {
 		require.Equal(t, 1.0, initializeResponse["id"])
 		require.NotNil(t, initializeResponse["result"])
 	})
+}
 
-	t.Run("NoCredentials", func(t *testing.T) {
-		t.Parallel()
-
-		ctx := testutil.Context(t, testutil.WaitShort)
-		cancelCtx, cancel := context.WithCancel(ctx)
-		t.Cleanup(cancel)
+func TestExpMcpServerNoCredentials(t *testing.T) {
+	// Ensure that no credentials are set from the environment.
+	t.Setenv("CODER_AGENT_TOKEN", "")
+	t.Setenv("CODER_AGENT_TOKEN_FILE", "")
+	t.Setenv("CODER_SESSION_TOKEN", "")
 
-		client := coderdtest.New(t, nil)
-		inv, root := clitest.New(t, "exp", "mcp", "server")
-		inv = inv.WithContext(cancelCtx)
+	ctx := testutil.Context(t, testutil.WaitShort)
+	cancelCtx, cancel := context.WithCancel(ctx)
+	t.Cleanup(cancel)
 
-		pty := ptytest.New(t)
-		inv.Stdin = pty.Input()
-		inv.Stdout = pty.Output()
-		inv.Stderr = pty.Output()
-		clitest.SetupConfig(t, client, root)
+	client := coderdtest.New(t, nil)
+	inv, root := clitest.New(t, "exp", "mcp", "server")
+	inv = inv.WithContext(cancelCtx)
 
-		cmdDone := make(chan struct{})
-		go func() {
-			defer close(cmdDone)
-			err := inv.Run()
-			assert.NoError(t, err)
-		}()
+	pty := ptytest.New(t)
+	inv.Stdin = pty.Input()
+	inv.Stdout = pty.Output()
+	clitest.SetupConfig(t, client, root)
 
-		pty.ExpectRegexMatch(`(?is)Authentication\s+:\s+None`)
-		cancel()
-		<-cmdDone
-	})
+	err := inv.Run()
+	assert.ErrorContains(t, err, "are not logged in")
 }
 
 //nolint:tparallel,paralleltest
