From 2ed79f6315a35a76b405f62aa85088a5b9bd9af4 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 29 Aug 2018 10:02:15 +0200 Subject: rootless: fix top join the user namespace used to create the container so that psgo can work in the same way as with root containers. Signed-off-by: Giuseppe Scrivano Closes: #1371 Approved by: rhatdan --- test/e2e/rootless_test.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'test/e2e') diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index 84af927ea..fb19b7c87 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -71,6 +71,7 @@ var _ = Describe("Podman rootless", func() { if err != nil { Skip("User namespaces not supported.") } + canUseExec := canExec() setup := podmanTest.Podman([]string{"create", ALPINE, "ls"}) setup.WaitWithDefaultTimeout() @@ -121,6 +122,22 @@ var _ = Describe("Podman rootless", func() { 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.WaitWithDefaultTimeout() + Expect(cmd.ExitCode()).To(Equal(0)) + + if canUseExec { + cmd = podmanTest.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.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) @@ -143,7 +160,7 @@ var _ = Describe("Podman rootless", func() { cmd.WaitWithDefaultTimeout() Expect(cmd.ExitCode()).To(Equal(0)) - if !canExec() { + if !canUseExec { Skip("ioctl(NS_GET_PARENT) not supported.") } -- cgit v1.2.3-54-g00ecf