diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-10-06 15:39:03 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-10-07 10:00:11 -0400 |
| commit | 55f5e4af11a2428b14b36bbdcd4b1d91e868d786 (patch) | |
| tree | 16d0ec8a616554c58f278067d89a6cc4665e5384 | |
| parent | 2bb2425704cc7181c5eb924400b351b3a2d9a592 (diff) | |
| download | podman-55f5e4af11a2428b14b36bbdcd4b1d91e868d786.tar.gz podman-55f5e4af11a2428b14b36bbdcd4b1d91e868d786.tar.bz2 podman-55f5e4af11a2428b14b36bbdcd4b1d91e868d786.zip | |
Use WaitWithDefaultTimeout in cleanup
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>
| -rw-r--r-- | test/e2e/common_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index c663a4dca..ec910109b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -453,7 +453,7 @@ 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() @@ -461,7 +461,7 @@ func (p *PodmanTestIntegration) Cleanup() { podrm.WaitWithDefaultTimeout() session := p.Podman([]string{"rm", "-fa"}) - session.Wait(90) + session.WaitWithDefaultTimeout() p.StopRemoteService() // Nuke tempdir |