From a62b3436db1929b5f73e247f4d1913072db09db1 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 9 Jul 2018 19:20:45 +0200 Subject: urfave/cli: fix regression in short-opts parsing Add the actual argument, not the one we're looking for when searching the to-be-translated short-opt string. Otherwise, we're likely to hit an infinite loop. Signed-off-by: Valentin Rothberg Closes: #1066 Approved by: rhatdan --- test/e2e/run_userns_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'test/e2e') diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 512857bcb..57c11848a 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -43,6 +43,25 @@ var _ = Describe("Podman UserNS support", func() { Expect(ok).To(BeTrue()) }) + // It essentially repeats the test above but with the `-it` short option + // that broke execution at: + // https://github.com/projectatomic/libpod/pull/1066#issuecomment-403562116 + // To avoid a potential future regression, use this as a test. + It("podman uidmapping and gidmapping with short-opts", func() { + if os.Getenv("SKIP_USERNS") != "" { + Skip("Skip userns tests.") + } + if _, err := os.Stat("/proc/self/uid_map"); err != nil { + Skip("User namespaces not supported.") + } + + session := podmanTest.Podman([]string{"run", "--uidmap=0:1:70000", "--gidmap=0:20000:70000", "-it", "busybox", "echo", "hello"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + ok, _ := session.GrepString("hello") + Expect(ok).To(BeTrue()) + }) + It("podman uidmapping and gidmapping --net=host", func() { if os.Getenv("SKIP_USERNS") != "" { Skip("Skip userns tests.") -- cgit v1.2.3-54-g00ecf