containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2022-05-10 13:23:04 +02:00
parent 28588235d2
commit d0ca90b3ed
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/common_test.go
View File

@ -516,17 +516,13 @@ func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegrat
// Cleanup cleans up the temporary store // Cleanup cleans up the temporary store
func (p *PodmanTestIntegration) Cleanup() { func (p *PodmanTestIntegration) Cleanup() {
// Remove all containers // Remove all pods...
stopall := p.Podman([]string{"stop", "-a", "--time", "0"}) podrm := p.Podman([]string{"pod", "rm", "-fa", "-t", "0"})
stopall.WaitWithDefaultTimeout()
podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"})
podstop.WaitWithDefaultTimeout()
podrm := p.Podman([]string{"pod", "rm", "-fa"})
podrm.WaitWithDefaultTimeout() podrm.WaitWithDefaultTimeout()
session := p.Podman([]string{"rm", "-fa"}) // ...and containers
session.WaitWithDefaultTimeout() rmall := p.Podman([]string{"rm", "-fa", "-t", "0"})
rmall.WaitWithDefaultTimeout()
p.StopRemoteService() p.StopRemoteService()
// Nuke tempdir // Nuke tempdir