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

Fix log level case regression 

With previous versions of Podman (like v1.9.2) it was always possible to
specify the log level in any case, for example `INFO`. This behavior has
silently changed, where the `--log-level` flag only accepts lower case
levels. This commit re-enables the old behavior and adds an e2e test for
it.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert 2020-08-25 21:48:18 +02:00
parent 061c93f701
commit d02cb2ddc0
No known key found for this signature in database
GPG Key ID: 8CE029DD1A866E52
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/root.go
View File

@ -226,7 +226,7 @@ func persistentPostRunE(cmd *cobra.Command, args []string) error {
func loggingHook() { func loggingHook() {
var found bool var found bool
for _, l := range logLevels { for _, l := range logLevels {
if l == logLevel { if l == strings.ToLower(logLevel) {
found = true found = true
break break
} }

12
test/e2e/run_test.go
View File

@ -1204,4 +1204,16 @@ WORKDIR /madethis`
// nonprintables seem to work their way in. // nonprintables seem to work their way in.
Expect(session.OutputToString()).To(Not(ContainSubstring("/bin/sh"))) Expect(session.OutputToString()).To(Not(ContainSubstring("/bin/sh")))
}) })
It("podman run a container with log-level (lower case)", func() {
session := podmanTest.Podman([]string{"--log-level=info", "run", ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
})
It("podman run a container with log-level (upper case)", func() {
session := podmanTest.Podman([]string{"--log-level=INFO", "run", ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
})
}) })