fix: wait for prompt on rich param CLI test

spikecurtis · spikecurtis · commit 1b7b6a6bce65 · 2024-11-06T16:53:21.000+04:00
diff --git a/cli/update_test.go b/cli/update_test.go
@@ -418,7 +418,9 @@ func TestUpdateValidateRichParameters(t *testing.T) {
 		err := inv.Run()
 		require.NoError(t, err)
 
+		ctx := testutil.Context(t, testutil.WaitLong)
 		inv, root = clitest.New(t, "update", "my-workspace", "--always-prompt")
+		inv = inv.WithContext(ctx)
 		clitest.SetupConfig(t, member, root)
 		doneChan := make(chan struct{})
 		pty := ptytest.New(t).Attach(inv)
@@ -428,18 +430,16 @@ func TestUpdateValidateRichParameters(t *testing.T) {
 			assert.NoError(t, err)
 		}()
 
-		matches := []string{
-			boolParameterName, "cat",
-			"boolean value can be either", "",
-			"Enter a value", "false",
-		}
-		for i := 0; i < len(matches); i += 2 {
-			match := matches[i]
-			value := matches[i+1]
-			pty.ExpectMatch(match)
-			pty.WriteLine(value)
-		}
-		<-doneChan
+		pty.ExpectMatch(boolParameterName)
+		pty.ExpectMatch("> Enter a value (default: \"\"): ")
+		pty.WriteLine("cat")
+		pty.ExpectMatch("boolean value can be either \"true\" or \"false\"")
+		pty.ExpectMatch("> Enter a value (default: \"\"): ")
+		pty.WriteLine("")
+		pty.ExpectMatch("boolean value can be either \"true\" or \"false\"")
+		pty.ExpectMatch("> Enter a value (default: \"\"): ")
+		pty.WriteLine("false")
+		_ = testutil.RequireRecvCtx(ctx, t, doneChan)
 	})
 
 	t.Run("RequiredParameterAdded", func(t *testing.T) {
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -198,7 +198,7 @@ func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, fn func
 		e.fatalf("read error", "%v (wanted %q; got %q)", err, str, buffer.String())
 		return ""
 	}
-	e.logf("matched %q = %q", str, stripansi.Strip(buffer.String()))
+	e.logf("matched %q = %q", str, buffer.String())
 	return buffer.String()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, fn func`
`198`	`198`	`e.fatalf("read error", "%v (wanted %q; got %q)", err, str, buffer.String())`
`199`	`199`	`return ""`
`200`	`200`	`}`
`201`		`- e.logf("matched %q = %q", str, stripansi.Strip(buffer.String()))`
	`201`	`+ e.logf("matched %q = %q", str, buffer.String())`
`202`	`202`	`return buffer.String()`
`203`	`203`	`}`
`204`	`204`