aboutsummaryrefslogtreecommitdiff
path: root/test/utils/utils.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-07-22 14:04:52 +0200
committerGitHub <noreply@github.com>2022-07-22 14:04:52 +0200
commit99bf6f96cd93867813e72742c484ab0abf15cca4 (patch)
tree6eb68a187f64d8947fa5a6d4a8a55c63cada49d9 /test/utils/utils.go
parent02eb057920cfd2542518497522f800f54a42643f (diff)
parent0a160fed77c753d1d5683ad40285bb41f1c895d5 (diff)
downloadpodman-99bf6f96cd93867813e72742c484ab0abf15cca4.tar.gz
podman-99bf6f96cd93867813e72742c484ab0abf15cca4.tar.bz2
podman-99bf6f96cd93867813e72742c484ab0abf15cca4.zip
Merge pull request #14972 from edsantiago/ubuntu_cgroups_v1
Bump VMs, to Ubuntu 2204 with cgroups v1
Diffstat (limited to 'test/utils/utils.go')
-rw-r--r--test/utils/utils.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 924f66ec8..e84b57cc6 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -367,8 +367,8 @@ func (s *PodmanSession) WaitWithDefaultTimeout() {
func (s *PodmanSession) WaitWithTimeout(timeout int) {
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()))
+ return fmt.Sprintf("command timed out after %ds: %v\nSTDOUT: %s\nSTDERR: %s",
+ timeout, s.Command.Args, string(s.Out.Contents()), string(s.Err.Contents()))
})
os.Stdout.Sync()
os.Stderr.Sync()