Skip to content

Commit

Permalink
Use WaitWithDefaultTimeout in cleanup
Browse files Browse the repository at this point in the history
Ensure that we actually print the output of all commands when
cleaning up the results of the E2E tests.

Signed-off-by: Matthew Heon <[email protected]>
  • Loading branch information
mheon committed Oct 7, 2020
1 parent 2bb2425 commit 55f5e4a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/e2e/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,15 +453,15 @@ func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegrat
func (p *PodmanTestIntegration) Cleanup() {
// Remove all containers
stopall := p.Podman([]string{"stop", "-a", "--time", "0"})
stopall.Wait(90)
stopall.WaitWithDefaultTimeout()

podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"})
podstop.WaitWithDefaultTimeout()
podrm := p.Podman([]string{"pod", "rm", "-fa"})
podrm.WaitWithDefaultTimeout()

session := p.Podman([]string{"rm", "-fa"})
session.Wait(90)
session.WaitWithDefaultTimeout()

p.StopRemoteService()
// Nuke tempdir
Expand Down

0 comments on commit 55f5e4a

Please sign in to comment.