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

Merge pull request #14872 from edsantiago/deferred_defer

Browse Source 
Manifest test cleanup: use defer()
This commit is contained in:
openshift-ci[bot]
2022-07-08 14:33:10 +00:00
committed by GitHub
parent 6087fb2116 1e7686df6e
commit cc6aac5be7
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/manifest_test.go
View File

@ -17,7 +17,6 @@ var _ = Describe("Podman manifest", func() {
tempdir string
err error
podmanTest *PodmanTestIntegration
registry *podmanRegistry.Registry
)
const (
@ -40,13 +39,6 @@ var _ = Describe("Podman manifest", func() {
})
AfterEach(func() {
// if auth test fails, it will leave a registry running
if registry != nil {
_ = registry.Stop()
}
// Also from auth test; don't propagate it to other tests
os.Unsetenv("PODMAN")
podmanTest.Cleanup()
f := CurrentGinkgoTestDescription()
processTestResult(f)
@ -312,8 +304,13 @@ var _ = Describe("Podman manifest", func() {
opts = strings.Join(getRemoteOptions(podmanTest, nil), " ")
}
os.Setenv("PODMAN", podmanTest.PodmanBinary+" "+opts)
registry, err = podmanRegistry.StartWithOptions(registryOptions)
registry, err := podmanRegistry.StartWithOptions(registryOptions)
Expect(err).To(BeNil())
defer func() {
err := registry.Stop()
Expect(err).To(BeNil())
os.Unsetenv("PODMAN")
}()
session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout()
@ -342,10 +339,6 @@ var _ = Describe("Podman manifest", func() {
push = podmanTest.Podman([]string{"manifest", "push", "--tls-verify=false", "--creds=podmantest:wrongpasswd", "foo", "localhost:" + registry.Port + "/credstest"})
push.WaitWithDefaultTimeout()
Expect(push).To(ExitWithError())
err = registry.Stop()
Expect(err).To(BeNil())
registry = nil
})
It("push with error", func() {