test: scaletest/reconnectingpty: use TerminalReader (#15079)

mtojek · web-flow · commit 2564f9c8231e · 2024-10-16T11:10:32.000+02:00
Fixes: coder/internal#98
diff --git a/scaletest/reconnectingpty/run_test.go b/scaletest/reconnectingpty/run_test.go
@@ -3,6 +3,7 @@ package reconnectingpty_test
 import (
 	"bytes"
 	"context"
+	"io"
 	"testing"
 	"time"
 
@@ -22,7 +23,6 @@ import (
 
 func Test_Runner(t *testing.T) {
 	t.Parallel()
-	t.Skip("https://github.com/coder/internal/issues/98")
 
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
@@ -43,14 +43,16 @@ func Test_Runner(t *testing.T) {
 
 		logs := bytes.NewBuffer(nil)
 		err := runner.Run(ctx, "1", logs)
-		logStr := logs.String()
-		t.Log("Runner logs:\n\n" + logStr)
 		require.NoError(t, err)
 
-		require.Contains(t, logStr, "Output:")
+		tr := testutil.NewTerminalReader(t, logs)
+		err = tr.ReadUntilString(ctx, "Output:")
+		require.NoError(t, err)
+
 		// OSX: Output:\n\thello world\n
 		// Win: Output:\n\t\x1b[2J\x1b[m\x1b[H\x1b]0;Administrator: C:\\Program Files\\PowerShell\\7\\pwsh.exe\a\x1b[?25hhello world\n
-		require.Contains(t, logStr, "hello world\n")
+		err = tr.ReadUntilString(ctx, "hello world")
+		require.NoError(t, err)
 	})
 
 	t.Run("NoLogOutput", func(t *testing.T) {
@@ -71,11 +73,12 @@ func Test_Runner(t *testing.T) {
 
 		logs := bytes.NewBuffer(nil)
 		err := runner.Run(ctx, "1", logs)
-		logStr := logs.String()
-		t.Log("Runner logs:\n\n" + logStr)
 		require.NoError(t, err)
 
-		require.NotContains(t, logStr, "Output:")
+		tr := testutil.NewTerminalReader(t, logs)
+		err = tr.ReadUntilString(ctx, "Output:")
+		require.Error(t, err)
+		require.ErrorIs(t, err, io.EOF)
 	})
 
 	t.Run("Timeout", func(t *testing.T) {
@@ -199,17 +202,18 @@ func Test_Runner(t *testing.T) {
 				Init: workspacesdk.AgentReconnectingPTYInit{
 					Command: "echo 'hello world'; sleep 1",
 				},
-				ExpectOutput: "hello world",
-				LogOutput:    false,
+				LogOutput: true,
 			})
 
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitSuperLong)
 			defer cancel()
 
 			logs := bytes.NewBuffer(nil)
 			err := runner.Run(ctx, "1", logs)
-			logStr := logs.String()
-			t.Log("Runner logs:\n\n" + logStr)
+			require.NoError(t, err)
+
+			tr := testutil.NewTerminalReader(t, logs)
+			err = tr.ReadUntilString(ctx, "hello world")
 			require.NoError(t, err)
 		})
 
@@ -223,19 +227,20 @@ func Test_Runner(t *testing.T) {
 				Init: workspacesdk.AgentReconnectingPTYInit{
 					Command: "echo 'hello world'; sleep 1",
 				},
-				ExpectOutput: "bello borld",
-				LogOutput:    false,
+				LogOutput: true,
 			})
 
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitSuperLong)
 			defer cancel()
 
 			logs := bytes.NewBuffer(nil)
 			err := runner.Run(ctx, "1", logs)
-			logStr := logs.String()
-			t.Log("Runner logs:\n\n" + logStr)
+			require.NoError(t, err)
+
+			tr := testutil.NewTerminalReader(t, logs)
+			err = tr.ReadUntilString(ctx, "bello borld")
 			require.Error(t, err)
-			require.ErrorContains(t, err, `expected string "bello borld" not found`)
+			require.ErrorIs(t, err, io.EOF)
 		})
 	})
 }
