opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-14 09:45:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman unshare keep exit code

Browse Source 
In case the command inside the podman unshare env failed podman unshare
always exits with 125 and prints `Error: exit status 125`. This is a
bad user experience and makes it difficult to use in scripts which could
expect certain exit codes.
This commit makes sure podman unshare uses the same exit code as the
command and does not print the useless `exit status X` message.

Also to match podman run/exec it should return 126 for EPERM
and 127 for ENOENT.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2021-09-09 22:10:17 +02:00
parent 580ac4c6ab
commit d2e10a71d6
3 changed files with 82 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/e2e/unshare_test.go
View File

@ -47,8 +47,7 @@ var _ = Describe("Podman unshare", func() {
session := podmanTest.Podman([]string{"unshare", "readlink", "/proc/self/ns/user"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
ok, _ := session.GrepString(userNS)
Expect(ok).To(BeFalse())
Expect(session.OutputToString()).ToNot(ContainSubstring(userNS))
})
It("podman unshare --rootles-cni", func() {
@ -57,4 +56,36 @@ var _ = Describe("Podman unshare", func() {
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("tap0"))
})
It("podman unshare exit codes", func() {
session := podmanTest.Podman([]string{"unshare", "false"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(1))
Expect(session.OutputToString()).Should(Equal(""))
Expect(session.ErrorToString()).Should(Equal(""))
session = podmanTest.Podman([]string{"unshare", "/usr/bin/bogus"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(127))
Expect(session.OutputToString()).Should(Equal(""))
Expect(session.ErrorToString()).Should(ContainSubstring("no such file or directory"))
session = podmanTest.Podman([]string{"unshare", "bogus"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(127))
Expect(session.OutputToString()).Should(Equal(""))
Expect(session.ErrorToString()).Should(ContainSubstring("executable file not found in $PATH"))
session = podmanTest.Podman([]string{"unshare", "/usr"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(126))
Expect(session.OutputToString()).Should(Equal(""))
Expect(session.ErrorToString()).Should(ContainSubstring("permission denied"))
session = podmanTest.Podman([]string{"unshare", "--bogus"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(125))
Expect(session.OutputToString()).Should(Equal(""))
Expect(session.ErrorToString()).Should(ContainSubstring("unknown flag: --bogus"))
})
})