opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

generate systemd: fix error handling

Browse Source 
Fix a bug in the error handling which returned nil instead of an error
and ultimately lead to nil dereferences in the client.  To prevent
future regressions, add a test and check for the error message.

Fixes: #7271
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2020-08-10 15:19:02 +02:00
parent da00482ef2
commit 6865058f2f
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/domain/infra/abi/generate.go
View File

@ -20,9 +20,10 @@ func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string,
if ctrErr == nil { if ctrErr == nil {
// Generate the unit for the container. // Generate the unit for the container.
s, err := generate.ContainerUnit(ctr, options) s, err := generate.ContainerUnit(ctr, options)
if err == nil { if err != nil {
return &entities.GenerateSystemdReport{Output: s}, nil return nil, err
} }
return &entities.GenerateSystemdReport{Output: s}, nil
} }
// If it's not a container, we either have a pod or garbage. // If it's not a container, we either have a pod or garbage.

12
test/e2e/generate_systemd_test.go
View File

@ -53,6 +53,18 @@ var _ = Describe("Podman generate systemd", func() {
Expect(session).To(ExitWithError()) Expect(session).To(ExitWithError())
}) })
It("podman generate systemd bad restart-policy value", func() {
session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session = podmanTest.Podman([]string{"generate", "systemd", "--restart-policy", "bogus", "foobar"})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
found, _ := session.ErrorGrepString("Error: bogus is not a valid restart policy")
Expect(found).Should(BeTrue())
})
It("podman generate systemd good timeout value", func() { It("podman generate systemd good timeout value", func() {
session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"}) session := podmanTest.Podman([]string{"create", "--name", "foobar", "alpine", "top"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()