opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

test/e2e: fix Cleanup()

Browse Source 
Only check exit codes last, othwerwise in case of errors it will return
early and miss other commands.
Also explicitly stop before rm, rm is not working in all cases (#18180).

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-04-13 10:55:52 +02:00
parent 9bd833bcfd
commit 9c1f713c75
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/common_test.go
View File

@ -569,6 +569,11 @@ func (p *PodmanTestIntegration) Quadlet(args []string, sourceDir string) *Podman
// Cleanup cleans up the temporary store // Cleanup cleans up the temporary store
func (p *PodmanTestIntegration) Cleanup() { func (p *PodmanTestIntegration) Cleanup() {
// first stop everything, rm -fa is unreliable
// https://github.com/containers/podman/issues/18180
stop := p.Podman([]string{"stop", "--all", "-t", "0"})
stop.WaitWithDefaultTimeout()
// Remove all pods... // Remove all pods...
podrm := p.Podman([]string{"pod", "rm", "-fa", "-t", "0"}) podrm := p.Podman([]string{"pod", "rm", "-fa", "-t", "0"})
podrm.WaitWithDefaultTimeout() podrm.WaitWithDefaultTimeout()
@ -577,16 +582,18 @@ func (p *PodmanTestIntegration) Cleanup() {
rmall := p.Podman([]string{"rm", "-fa", "-t", "0"}) rmall := p.Podman([]string{"rm", "-fa", "-t", "0"})
rmall.WaitWithDefaultTimeout() rmall.WaitWithDefaultTimeout()
// make sure to only check exit code after both commands ran otherwise we leak when pod rm fails
Expect(podrm).To(Exit(0))
Expect(rmall).To(Exit(0))
p.StopRemoteService() p.StopRemoteService()
// Nuke tempdir // Nuke tempdir
p.removeCache(p.TempDir) p.removeCache(p.TempDir)
// Clean up the registries configuration file ENV variable set in Create // Clean up the registries configuration file ENV variable set in Create
resetRegistriesConfigEnv() resetRegistriesConfigEnv()
// Make sure to only check exit codes after all cleanup is done.
// An error would cause it to stop and return early otherwise.
Expect(stop).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", stop.Command.Args, stop.OutputToString(), stop.ErrorToString())
Expect(podrm).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", podrm.Command.Args, podrm.OutputToString(), podrm.ErrorToString())
Expect(rmall).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", rmall.Command.Args, rmall.OutputToString(), rmall.ErrorToString())
} }
// CleanupVolume cleans up the temporary store // CleanupVolume cleans up the temporary store