Check matcher earlier

code-asher · code-asher · commit 149e66173258 · 2023-08-16T12:43:54.000-08:00
diff --git a/testutil/pty.go b/testutil/pty.go
@@ -55,10 +55,14 @@ func ReadUntil(ctx context.Context, t *testing.T, r io.Reader, matcher func(line
 		case <-ctx.Done():
 			return ctx.Err()
 		}
+		if matcher == nil {
+			// A nil matcher means to read until EOF.
+			continue
+		}
 		got := term.String()
 		lines := strings.Split(got, "\n")
 		for _, line := range lines {
-			if matcher != nil && matcher(line) {
+			if matcher(line) {
 				return nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,14 @@ func ReadUntil(ctx context.Context, t *testing.T, r io.Reader, matcher func(line`
`55`	`55`	`case <-ctx.Done():`
`56`	`56`	`return ctx.Err()`
`57`	`57`	`}`
	`58`	`+ if matcher == nil {`
	`59`	`+ // A nil matcher means to read until EOF.`
	`60`	`+ continue`
	`61`	`+ }`
`58`	`62`	`got := term.String()`
`59`	`63`	`lines := strings.Split(got, "\n")`
`60`	`64`	`for _, line := range lines {`
`61`		`- if matcher != nil && matcher(line) {`
	`65`	`+ if matcher(line) {`
`62`	`66`	`return nil`
`63`	`67`	`}`
`64`	`68`	`}`