aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2020-08-25 21:48:18 +0200
committerSascha Grunert <sgrunert@suse.com>2020-08-28 12:09:08 +0200
commitd02cb2ddc014b6ebf14aea06254fb8d85a548e07 (patch)
tree517a999672cbf54e06fa103d65fa1ac21fc77494
parent061c93f70101026d79cca6e75ac0c565e1fa99ec (diff)
downloadpodman-d02cb2ddc014b6ebf14aea06254fb8d85a548e07.tar.gz
podman-d02cb2ddc014b6ebf14aea06254fb8d85a548e07.tar.bz2
podman-d02cb2ddc014b6ebf14aea06254fb8d85a548e07.zip
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>
-rw-r--r--cmd/podman/root.go2
-rw-r--r--test/e2e/run_test.go12
2 files changed, 13 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 8f77e5893..749a5fbe7 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -226,7 +226,7 @@ func persistentPostRunE(cmd *cobra.Command, args []string) error {
func loggingHook() {
var found bool
for _, l := range logLevels {
- if l == logLevel {
+ if l == strings.ToLower(logLevel) {
found = true
break
}
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 157b7d3d7..91b0d3e48 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -1204,4 +1204,16 @@ WORKDIR /madethis`
// nonprintables seem to work their way in.
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))
+ })
})