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

Merge pull request #18442 from Luap99/e2e-noerrout 

test/e2e: check for stderr errors in cleanup()
This commit is contained in:
openshift-merge-bot[bot] 2024-03-04 11:45:55 +00:00 committed by GitHub
parent c77f0031f9 ebce0e71da
commit 5a4864c340
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/common_test.go
View File

@ -675,8 +675,20 @@ func (p *PodmanTestIntegration) Cleanup() {
// 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())
checkStderrCleanupError(stop, "stop --all -t0 error logged")
Expect(podrm).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", podrm.Command.Args, podrm.OutputToString(), podrm.ErrorToString())
checkStderrCleanupError(podrm, "pod rm -fa -t0 error logged")
Expect(rmall).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", rmall.Command.Args, rmall.OutputToString(), rmall.ErrorToString())
checkStderrCleanupError(rmall, "rm -fa -t0 error logged")
}
func checkStderrCleanupError(s *PodmanSessionIntegration, cmd string) {
if strings.Contains(podmanTest.OCIRuntime, "runc") {
// we cannot check stderr for runc, way to many errors
return
}
// offset is 1 so the stacj trace doesn't link to this helper function here
ExpectWithOffset(1, s.ErrorToString()).To(BeEmpty(), cmd)
}
// CleanupVolume cleans up the volumes and containers.
@ -686,6 +698,7 @@ func (p *PodmanTestIntegration) CleanupVolume() {
session := p.Podman([]string{"volume", "rm", "-fa"})
session.WaitWithDefaultTimeout()
Expect(session).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", session.Command.Args, session.OutputToString(), session.ErrorToString())
checkStderrCleanupError(session, "volume rm -fa error logged")
}
// CleanupSecret cleans up the secrets and containers.
@ -695,6 +708,7 @@ func (p *PodmanTestIntegration) CleanupSecrets() {
session := p.Podman([]string{"secret", "rm", "-a"})
session.Wait(90)
Expect(session).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", session.Command.Args, session.OutputToString(), session.ErrorToString())
checkStderrCleanupError(session, "secret rm -a error logged")
}
// InspectContainerToJSON takes the session output of an inspect