fixup! fixup! Simplify assertion type

cmoog · cmoog · commit ba7746140bc3 · 2020-07-28T22:08:11.000-05:00
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -258,7 +258,6 @@ func StdoutEmpty() Assertion {
 func GetResult(result **CommandResult) Assertion {
 	return func(t *testing.T, r *CommandResult) {
 		slog.Helper()
-		empty(t, "stdout", r.Stdout)
 		*result = r
 	}
 }
@@ -287,15 +286,6 @@ func StderrMatches(pattern string) Assertion {
 	}
 }
 
-// CombinedMatches asserts that either Stdout or Stderr a substring which matches the given regexp
-func CombinedMatches(pattern string) Assertion {
-	return func(t *testing.T, r *CommandResult) {
-		slog.Helper()
-		StdoutMatches(pattern)(t, r)
-		StderrMatches(pattern)(t, r)
-	}
-}
-
 func matches(t *testing.T, name, pattern string, target []byte) {
 	slog.Helper()
 

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ func StdoutEmpty() Assertion {`
`258`	`258`	`func GetResult(result **CommandResult) Assertion {`
`259`	`259`	`return func(t testing.T, r CommandResult) {`
`260`	`260`	`slog.Helper()`
`261`		`- empty(t, "stdout", r.Stdout)`
`262`	`261`	`*result = r`
`263`	`262`	`}`
`264`	`263`	`}`
`@@ -287,15 +286,6 @@ func StderrMatches(pattern string) Assertion {`
`287`	`286`	`}`
`288`	`287`	`}`
`289`	`288`
`290`		`-// CombinedMatches asserts that either Stdout or Stderr a substring which matches the given regexp`
`291`		`-func CombinedMatches(pattern string) Assertion {`
`292`		`- return func(t testing.T, r CommandResult) {`
`293`		`- slog.Helper()`
`294`		`- StdoutMatches(pattern)(t, r)`
`295`		`- StderrMatches(pattern)(t, r)`
`296`		`- }`
`297`		`-}`
`298`		`-`
`299`	`289`	`func matches(t *testing.T, name, pattern string, target []byte) {`
`300`	`290`	`slog.Helper()`
`301`	`291`