summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-11 02:39:57 -0400
committerGitHub <noreply@github.com>2022-05-11 02:39:57 -0400
commited1ba27f8dc33672e8361c6c1a71cf95b1b79e9a (patch)
tree17f8a54b936437b2fa28dce511c8700923418225
parent32021ebc70d3520d2528da10c3699f866046703c (diff)
parentd0ca90b3ed3ed543372158633d89811604e7797c (diff)
downloadpodman-ed1ba27f8dc33672e8361c6c1a71cf95b1b79e9a.tar.gz
podman-ed1ba27f8dc33672e8361c6c1a71cf95b1b79e9a.tar.bz2
podman-ed1ba27f8dc33672e8361c6c1a71cf95b1b79e9a.zip
Merge pull request #14176 from giuseppe/test-parallel-rm-cleanup
test: simplify cleanup code
-rw-r--r--test/e2e/common_test.go14
1 files changed, 5 insertions, 9 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 28991af7f..db194b777 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -516,17 +516,13 @@ func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegrat
// Cleanup cleans up the temporary store
func (p *PodmanTestIntegration) Cleanup() {
- // Remove all containers
- stopall := p.Podman([]string{"stop", "-a", "--time", "0"})
- stopall.WaitWithDefaultTimeout()
-
- podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"})
- podstop.WaitWithDefaultTimeout()
- podrm := p.Podman([]string{"pod", "rm", "-fa"})
+ // Remove all pods...
+ podrm := p.Podman([]string{"pod", "rm", "-fa", "-t", "0"})
podrm.WaitWithDefaultTimeout()
- session := p.Podman([]string{"rm", "-fa"})
- session.WaitWithDefaultTimeout()
+ // ...and containers
+ rmall := p.Podman([]string{"rm", "-fa", "-t", "0"})
+ rmall.WaitWithDefaultTimeout()
p.StopRemoteService()
// Nuke tempdir