diff options
| -rw-r--r-- | test/e2e/run_ns_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/run_userns_test.go | 42 |
2 files changed, 10 insertions, 34 deletions
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 5236e6584..51f921bce 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -63,7 +63,6 @@ var _ = Describe("Podman run ns", func() { }) It("podman run ipcns ipcmk host test", func() { - SkipIfRootless() setup := SystemExec("ipcmk", []string{"-M", "1024"}) Expect(setup.ExitCode()).To(Equal(0)) output := strings.Split(setup.OutputToString(), " ") @@ -77,7 +76,6 @@ var _ = Describe("Podman run ns", func() { }) It("podman run ipcns ipcmk container test", func() { - SkipIfRootless() setup := podmanTest.Podman([]string{"run", "-d", "--name", "test1", fedoraMinimal, "sleep", "999"}) setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 5c38a8950..f7f0e1c9a 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -18,7 +18,12 @@ var _ = Describe("Podman UserNS support", func() { ) BeforeEach(func() { - SkipIfRootless() + if os.Getenv("SKIP_USERNS") != "" { + Skip("Skip userns tests.") + } + if _, err := os.Stat("/proc/self/uid_map"); err != nil { + Skip("User namespaces not supported.") + } tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -36,14 +41,7 @@ var _ = Describe("Podman UserNS support", func() { }) It("podman uidmapping and gidmapping", 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", "busybox", "echo", "hello"}) + session := podmanTest.Podman([]string{"run", "--uidmap=0:100:5000", "--gidmap=0:200:5000", "alpine", "echo", "hello"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) ok, _ := session.GrepString("hello") @@ -55,14 +53,7 @@ var _ = Describe("Podman UserNS support", func() { // https://github.com/containers/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 := podmanTest.Podman([]string{"run", "--uidmap=0:1:5000", "--gidmap=0:200:5000", "-it", "alpine", "echo", "hello"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) ok, _ := session.GrepString("hello") @@ -70,14 +61,7 @@ var _ = Describe("Podman UserNS support", func() { }) It("podman uidmapping and gidmapping with a volume", 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", "-v", "my-foo-volume:/foo:Z", "busybox", "echo", "hello"}) + session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z", "alpine", "echo", "hello"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) ok, _ := session.GrepString("hello") @@ -85,13 +69,7 @@ var _ = Describe("Podman UserNS support", func() { }) It("podman uidmapping and gidmapping --net=host", 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", "--net=host", "--uidmap=0:1:70000", "--gidmap=0:20000:70000", "busybox", "echo", "hello"}) + session := podmanTest.Podman([]string{"run", "--net=host", "--uidmap=0:1:5000", "--gidmap=0:200:5000", "alpine", "echo", "hello"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) ok, _ := session.GrepString("hello") |