fix unhandled terminal output in test

mafredri · mafredri · commit 7bd2ed069092 · 2024-02-19T14:57:30.000+02:00
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -312,18 +312,14 @@ func TestAgent_Session_EnvironmentVariables(t *testing.T) {
 	require.NoError(t, err)
 
 	command := "sh"
-	echoEnv := func(t *testing.T, w io.Writer, r io.Reader, env string) string {
+	echoEnv := func(t *testing.T, w io.Writer, env string) {
 		if runtime.GOOS == "windows" {
 			_, err := fmt.Fprintf(w, "echo %%%s%%\r\n", env)
 			require.NoError(t, err)
 		} else {
 			_, err := fmt.Fprintf(w, "echo $%s\n", env)
 			require.NoError(t, err)
 		}
-		scanner := bufio.NewScanner(r)
-		require.True(t, scanner.Scan())
-		t.Logf("%s=%s", env, scanner.Text())
-		return scanner.Text()
 	}
 	if runtime.GOOS == "windows" {
 		command = "cmd.exe"
@@ -337,6 +333,22 @@ func TestAgent_Session_EnvironmentVariables(t *testing.T) {
 	err = session.Start(command)
 	require.NoError(t, err)
 
+	ctx := testutil.Context(t, testutil.WaitLong)
+
+	s := bufio.NewScanner(stdout)
+	out := make(chan string)
+	testutil.Go(t, func() {
+		for s.Scan() {
+			select {
+			case out <- s.Text():
+			case <-ctx.Done():
+				return
+			}
+		}
+	})
+
+	// Until we have gotten the first result, the shell may spit out some data.
+	first := true
 	//nolint:paralleltest // These tests need to run sequentially.
 	for k, partialV := range map[string]string{
 		"CODER":               "true",  // From the agent.
@@ -347,8 +359,21 @@ func TestAgent_Session_EnvironmentVariables(t *testing.T) {
 		"PATH":                scriptBinDir + string(filepath.ListSeparator),
 	} {
 		t.Run(k, func(t *testing.T) {
-			out := echoEnv(t, stdin, stdout, k)
-			require.Contains(t, strings.TrimSpace(out), partialV)
+			echoEnv(t, stdin, k)
+			if first {
+				for {
+					s := testutil.RequireRecvCtx(ctx, t, out)
+					t.Logf("%s=%s", k, s)
+					s = strings.TrimSpace(s)
+					if strings.Contains(s, partialV) {
+						first = false
+						return
+					}
+				}
+			}
+			s := testutil.RequireRecvCtx(ctx, t, out)
+			t.Logf("%s=%s", k, s)
+			require.Contains(t, s, partialV)
 		})
 	}
 }
