Merge pull request #15021 from Luap99/e2e-timeout-output

e2e: show command and output when a timeout happens
containers · Jul 21, 2022 · 04ed519 · 04ed519
2 parents 53dfc23 + 3a016c6
commit 04ed519
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/test/utils/utils.go b/test/utils/utils.go
@@ -365,7 +365,11 @@ func (s *PodmanSession) WaitWithDefaultTimeout() {
 
 // WaitWithTimeout waits for process finished with DefaultWaitTimeout
 func (s *PodmanSession) WaitWithTimeout(timeout int) {
-	Eventually(s, timeout).Should(Exit())
+	Eventually(s, timeout).Should(Exit(), func() string {
+		// in case of timeouts show output
+		return fmt.Sprintf("command %v timed out\nSTDOUT: %s\nSTDERR: %s",
+			s.Command.Args, string(s.Out.Contents()), string(s.Err.Contents()))
+	})
 	os.Stdout.Sync()
 	os.Stderr.Sync()
 	fmt.Println("output:", s.OutputToString())