aboutsummaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-25 18:50:59 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-26 07:22:42 +0000
commit8b5823a62d1149b59a08d652809d2d117e7b46eb (patch)
treefc73965188f63dadcfcca536b9a034663751983a /test/e2e
parentc5753f57c1a929f80fb768ff62bd35f383584aed (diff)
downloadpodman-8b5823a62d1149b59a08d652809d2d117e7b46eb.tar.gz
podman-8b5823a62d1149b59a08d652809d2d117e7b46eb.tar.bz2
podman-8b5823a62d1149b59a08d652809d2d117e7b46eb.zip
rootless: don't use kill --all
The OCI runtime might use the cgroups to see what PIDs are inside the container, but that doesn't work with rootless containers. Closes: https://github.com/containers/libpod/issues/1337 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1331 Approved by: rhatdan
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/rootless_test.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go
index 195f403e1..255aaae41 100644
--- a/test/e2e/rootless_test.go
+++ b/test/e2e/rootless_test.go
@@ -117,6 +117,10 @@ var _ = Describe("Podman rootless", func() {
Expect(cmd.ExitCode()).To(Equal(0))
Expect(cmd.LineInOutputContains("hello")).To(BeTrue())
+ 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)