aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-07 15:06:02 -0400
committerGitHub <noreply@github.com>2020-10-07 15:06:02 -0400
commit0e1d01103e45430693736dac10be13c49cf23f03 (patch)
treeaed0f84e88d4e4de22b5e262761e95c951f4f610 /test
parent9ae873e60e149677db66782eaf2b4ed1402e97d2 (diff)
parent55f5e4af11a2428b14b36bbdcd4b1d91e868d786 (diff)
downloadpodman-0e1d01103e45430693736dac10be13c49cf23f03.tar.gz
podman-0e1d01103e45430693736dac10be13c49cf23f03.tar.bz2
podman-0e1d01103e45430693736dac10be13c49cf23f03.zip
Merge pull request #7382 from mheon/pod_parallel
Move pod jobs to parallel execution
Diffstat (limited to 'test')
-rw-r--r--test/e2e/common_test.go4
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