From bdee681409f595443d4f3cb4f08b76d24139d6a8 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 29 Aug 2018 15:02:33 +0200 Subject: rootless, tests: add tests for the pod command also refactor the rootless_test.go to facilitate running a test in a rootless context. Signed-off-by: Giuseppe Scrivano Closes: #1372 Approved by: mheon --- test/e2e/rootless_test.go | 152 +++++++++++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 64 deletions(-) diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index fb19b7c87..84d5cd6f1 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -65,14 +65,14 @@ var _ = Describe("Podman rootless", func() { return os.Lchown(p, 1000, 1000) } - runRootless := func(args []string) { + type rootlessCB func(test PodmanTest, xdgRuntimeDir string, home string, mountPath string) + + runInRootlessContext := func(cb rootlessCB) { // Check if we can create an user namespace err := exec.Command("unshare", "-r", "echo", "hello").Run() if err != nil { Skip("User namespaces not supported.") } - canUseExec := canExec() - setup := podmanTest.Podman([]string{"create", ALPINE, "ls"}) setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) @@ -84,79 +84,128 @@ var _ = Describe("Podman rootless", func() { mountPath := mount.OutputToString() err = filepath.Walk(tempdir, chownFunc) - if err != nil { - fmt.Printf("cannot chown the directory: %q\n", err) - os.Exit(1) + Expect(err).To(BeNil()) + + tempdir, err := CreateTempDirInTempDir() + Expect(err).To(BeNil()) + rootlessTest := PodmanCreate(tempdir) + err = filepath.Walk(tempdir, chownFunc) + Expect(err).To(BeNil()) + + xdgRuntimeDir, err := ioutil.TempDir("/run", "") + Expect(err).To(BeNil()) + defer os.RemoveAll(xdgRuntimeDir) + err = filepath.Walk(xdgRuntimeDir, chownFunc) + Expect(err).To(BeNil()) + + home, err := CreateTempDirInTempDir() + Expect(err).To(BeNil()) + err = filepath.Walk(home, chownFunc) + Expect(err).To(BeNil()) + + cb(rootlessTest, xdgRuntimeDir, home, mountPath) + + umount := podmanTest.Podman([]string{"umount", cid}) + umount.WaitWithDefaultTimeout() + Expect(umount.ExitCode()).To(Equal(0)) + } + + It("podman rootless pod", func() { + f := func(rootlessTest PodmanTest, xdgRuntimeDir string, home string, mountPath string) { + env := os.Environ() + env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) + env = append(env, fmt.Sprintf("HOME=%s", home)) + env = append(env, "PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS=1") + + cmd := rootlessTest.PodmanAsUser([]string{"pod", "create", "--infra=false"}, 1000, 1000, env) + cmd.WaitWithDefaultTimeout() + Expect(cmd.ExitCode()).To(Equal(0)) + podId := cmd.OutputToString() + + args := []string{"run", "--pod", podId, "--rootfs", mountPath, "echo", "hello"} + cmd = rootlessTest.PodmanAsUser(args, 1000, 1000, env) + cmd.WaitWithDefaultTimeout() + Expect(cmd.ExitCode()).To(Equal(0)) + Expect(cmd.LineInOutputContains("hello")).To(BeTrue()) } + runInRootlessContext(f) + }) - runRootless := func(mountPath string) { - tempdir, err := CreateTempDirInTempDir() - Expect(err).To(BeNil()) - podmanTest := PodmanCreate(tempdir) - err = filepath.Walk(tempdir, chownFunc) - Expect(err).To(BeNil()) + It("podman rootless search", func() { + xdgRuntimeDir, err := ioutil.TempDir("/run", "") + Expect(err).To(BeNil()) + defer os.RemoveAll(xdgRuntimeDir) + err = filepath.Walk(xdgRuntimeDir, chownFunc) + Expect(err).To(BeNil()) - xdgRuntimeDir, err := ioutil.TempDir("/run", "") - Expect(err).To(BeNil()) - defer os.RemoveAll(xdgRuntimeDir) - err = filepath.Walk(xdgRuntimeDir, chownFunc) - Expect(err).To(BeNil()) + home, err := CreateTempDirInTempDir() + Expect(err).To(BeNil()) + err = filepath.Walk(home, chownFunc) + Expect(err).To(BeNil()) - home, err := CreateTempDirInTempDir() - Expect(err).To(BeNil()) - err = filepath.Walk(xdgRuntimeDir, chownFunc) - Expect(err).To(BeNil()) + env := os.Environ() + env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) + env = append(env, fmt.Sprintf("HOME=%s", home)) + cmd := podmanTest.PodmanAsUser([]string{"search", "docker.io/busybox"}, 1000, 1000, env) + cmd.WaitWithDefaultTimeout() + Expect(cmd.ExitCode()).To(Equal(0)) + }) + runRootlessHelper := func(args []string) { + f := func(rootlessTest PodmanTest, xdgRuntimeDir string, home string, mountPath string) { env := os.Environ() env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) env = append(env, fmt.Sprintf("HOME=%s", home)) env = append(env, "PODMAN_ALLOW_SINGLE_ID_MAPPING_IN_USERNS=1") + allArgs := append([]string{"run"}, args...) allArgs = append(allArgs, "--rootfs", mountPath, "echo", "hello") - cmd := podmanTest.PodmanAsUser(allArgs, 1000, 1000, env) + cmd := rootlessTest.PodmanAsUser(allArgs, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) Expect(cmd.LineInOutputContains("hello")).To(BeTrue()) - cmd = podmanTest.PodmanAsUser([]string{"rm", "-l", "-f"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"rm", "-l", "-f"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) allArgs = append([]string{"run", "-d"}, args...) allArgs = append(allArgs, "--security-opt", "seccomp=unconfined", "--rootfs", mountPath, "top") - cmd = podmanTest.PodmanAsUser(allArgs, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser(allArgs, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) + canUseExec := canExec() + if canUseExec { - cmd = podmanTest.PodmanAsUser([]string{"top", "-l"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"top", "-l"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) } - cmd = podmanTest.PodmanAsUser([]string{"rm", "-l", "-f"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"rm", "-l", "-f"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) allArgs = append([]string{"run", "-d"}, args...) allArgs = append(allArgs, "--security-opt", "seccomp=unconfined", "--rootfs", mountPath, "unshare", "-r", "unshare", "-r", "top") - cmd = podmanTest.PodmanAsUser(allArgs, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser(allArgs, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - cmd = podmanTest.PodmanAsUser([]string{"kill", "-l"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"kill", "-l"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - cmd = podmanTest.PodmanAsUser([]string{"start", "-l"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"start", "-l"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - cmd = podmanTest.PodmanAsUser([]string{"stop", "-l", "-t", "0"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"stop", "-l", "-t", "0"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - cmd = podmanTest.PodmanAsUser([]string{"start", "-l"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"start", "-l"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) @@ -164,60 +213,35 @@ var _ = Describe("Podman rootless", func() { Skip("ioctl(NS_GET_PARENT) not supported.") } - cmd = podmanTest.PodmanAsUser([]string{"exec", "-l", "echo", "hello"}, 1000, 1000, env) + cmd = rootlessTest.PodmanAsUser([]string{"exec", "-l", "echo", "hello"}, 1000, 1000, env) cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) Expect(cmd.LineInOutputContains("hello")).To(BeTrue()) } - - runRootless(mountPath) - - umount := podmanTest.Podman([]string{"umount", cid}) - umount.WaitWithDefaultTimeout() - Expect(umount.ExitCode()).To(Equal(0)) + runInRootlessContext(f) } - It("podman rootless search", func() { - xdgRuntimeDir, err := ioutil.TempDir("/run", "") - Expect(err).To(BeNil()) - defer os.RemoveAll(xdgRuntimeDir) - err = filepath.Walk(xdgRuntimeDir, chownFunc) - Expect(err).To(BeNil()) - - home, err := CreateTempDirInTempDir() - Expect(err).To(BeNil()) - err = filepath.Walk(xdgRuntimeDir, chownFunc) - Expect(err).To(BeNil()) - - env := os.Environ() - env = append(env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", xdgRuntimeDir)) - env = append(env, fmt.Sprintf("HOME=%s", home)) - cmd := podmanTest.PodmanAsUser([]string{"search", "docker.io/busybox"}, 1000, 1000, env) - cmd.WaitWithDefaultTimeout() - Expect(cmd.ExitCode()).To(Equal(0)) - }) - It("podman rootless rootfs", func() { - runRootless([]string{}) + runRootlessHelper([]string{}) }) It("podman rootless rootfs --net host", func() { - runRootless([]string{"--net", "host"}) + runRootlessHelper([]string{"--net", "host"}) }) It("podman rootless rootfs --privileged", func() { - runRootless([]string{"--privileged"}) + runRootlessHelper([]string{"--privileged"}) }) It("podman rootless rootfs --net host --privileged", func() { - runRootless([]string{"--net", "host", "--privileged"}) + runRootlessHelper([]string{"--net", "host", "--privileged"}) }) It("podman rootless rootfs --uts host", func() { - runRootless([]string{"--uts", "host"}) + runRootlessHelper([]string{"--uts", "host"}) }) It("podman rootless rootfs --ipc host", func() { - runRootless([]string{"--ipc", "host"}) + runRootlessHelper([]string{"--ipc", "host"}) }) }) -- cgit v1.2.3-54-g00ecf