From d0ca90b3ed3ed543372158633d89811604e7797c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 10 May 2022 13:23:04 +0200 Subject: test: simplify cleanup code do not try to first stop and then rm but combine the two operations in a single command. Signed-off-by: Giuseppe Scrivano --- test/e2e/common_test.go | 14 +++++--------- 1 file 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 -- cgit v1.2.3-54-g00ecf