Merge pull request #3768 from ActiveState/mitchell/cp-1130

mitchell-as · web-flow · commit b66df03302fa · 2025-11-26T12:54:41.000-05:00
Merge v0.48.1-RC1 to master
diff --git a/test/integration/performance_int_test.go b/test/integration/performance_int_test.go
@@ -69,9 +69,9 @@ func performanceTest(commands []string, expect string, samples int, maxTime time
 		}
 		cp := ts.SpawnWithOpts(opts...)
 		if expect != "" {
-			cp.Expect(expect)
+			cp.Expect(expect, termtest.OptExpectTimeout(1*time.Minute))
 		}
-		cp.ExpectExitCode(0)
+		cp.ExpectExitCode(0, termtest.OptExpectTimeout(1*time.Minute))
 		logs, err := io.ReadAll(termtestLogs)
 		suite.NoError(err)
 		v := rx.FindStringSubmatch(cp.Output())

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ func performanceTest(commands []string, expect string, samples int, maxTime time`
`69`	`69`	`}`
`70`	`70`	`cp := ts.SpawnWithOpts(opts...)`
`71`	`71`	`if expect != "" {`
`72`		`- cp.Expect(expect)`
	`72`	`+ cp.Expect(expect, termtest.OptExpectTimeout(1*time.Minute))`
`73`	`73`	`}`
`74`		`- cp.ExpectExitCode(0)`
	`74`	`+ cp.ExpectExitCode(0, termtest.OptExpectTimeout(1*time.Minute))`
`75`	`75`	`logs, err := io.ReadAll(termtestLogs)`
`76`	`76`	`suite.NoError(err)`
`77`	`77`	`v := rx.FindStringSubmatch(cp.Output())`