aboutsummaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-11 16:26:46 +0100
committerGitHub <noreply@github.com>2019-02-11 16:26:46 +0100
commit921f98f8795eb9fcb19ce581020cfdeff6dee09f (patch)
tree82dc53e3c61fec956eef1efa3e540d1abe5df7f4 /test/e2e
parentdc5c061cdcad2f815d9f8c0556a3e13824e6ba75 (diff)
parentcbeca379250932f01fa4e2ffc70e9c2ecd6701bc (diff)
downloadpodman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.tar.gz
podman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.tar.bz2
podman-921f98f8795eb9fcb19ce581020cfdeff6dee09f.zip
Merge pull request #2294 from mheon/v1.0_backports
V1.0 backports
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/prune_test.go3
-rw-r--r--test/e2e/rootless_test.go4
2 files changed, 6 insertions, 1 deletions
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go
index 6679a676c..149f1ac60 100644
--- a/test/e2e/prune_test.go
+++ b/test/e2e/prune_test.go
@@ -72,10 +72,11 @@ var _ = Describe("Podman rm", func() {
Expect(none.ExitCode()).To(Equal(0))
hasNoneAfter, _ := after.GrepString("<none>")
Expect(hasNoneAfter).To(BeFalse())
+ Expect(len(after.OutputToStringArray()) > 1).To(BeTrue())
})
It("podman image prune unused images", func() {
- prune := podmanTest.Podman([]string{"image", "prune"})
+ prune := podmanTest.Podman([]string{"image", "prune", "-a"})
prune.WaitWithDefaultTimeout()
Expect(prune.ExitCode()).To(Equal(0))
diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go
index 8e9f9fc8d..e9606f859 100644
--- a/test/e2e/rootless_test.go
+++ b/test/e2e/rootless_test.go
@@ -274,6 +274,10 @@ var _ = Describe("Podman rootless", func() {
runRootlessHelper([]string{"--net", "host"})
})
+ It("podman rootless rootfs --pid host", func() {
+ runRootlessHelper([]string{"--pid", "host"})
+ })
+
It("podman rootless rootfs --privileged", func() {
runRootlessHelper([]string{"--privileged"})
})