opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use WaitWithDefaultTimeout in cleanup

Browse Source 
Ensure that we actually print the output of all commands when
cleaning up the results of the E2E tests.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2020-10-06 15:39:03 -04:00
parent 2bb2425704
commit 55f5e4af11
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/common_test.go
View File

@ -453,7 +453,7 @@ func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegrat
func (p *PodmanTestIntegration) Cleanup() { func (p *PodmanTestIntegration) Cleanup() {
// Remove all containers // Remove all containers
stopall := p.Podman([]string{"stop", "-a", "--time", "0"}) stopall := p.Podman([]string{"stop", "-a", "--time", "0"})
stopall.Wait(90) stopall.WaitWithDefaultTimeout()
podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"}) podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"})
podstop.WaitWithDefaultTimeout() podstop.WaitWithDefaultTimeout()
@ -461,7 +461,7 @@ func (p *PodmanTestIntegration) Cleanup() {
podrm.WaitWithDefaultTimeout() podrm.WaitWithDefaultTimeout()
session := p.Podman([]string{"rm", "-fa"}) session := p.Podman([]string{"rm", "-fa"})
session.Wait(90) session.WaitWithDefaultTimeout()
p.StopRemoteService() p.StopRemoteService()
// Nuke tempdir // Nuke tempdir