diff options
author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-19 09:55:21 +0100 |
---|---|---|
committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-19 15:01:53 +0100 |
commit | b581fa1510f00864386859dd30f5392c6a521c0c (patch) | |
tree | 6fa3cd6c3279485dfbf6aebd2e542e440296d74b /test/e2e | |
parent | ab576e8577b6cc95aebf4afb84d104cb74ea8717 (diff) | |
download | podman-b581fa1510f00864386859dd30f5392c6a521c0c.tar.gz podman-b581fa1510f00864386859dd30f5392c6a521c0c.tar.bz2 podman-b581fa1510f00864386859dd30f5392c6a521c0c.zip |
tests: re-enable some tests for rootless mode
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/pod_create_test.go | 5 | ||||
-rw-r--r-- | test/e2e/pod_infra_container_test.go | 3 | ||||
-rw-r--r-- | test/e2e/pod_kill_test.go | 5 | ||||
-rw-r--r-- | test/e2e/pod_pod_namespaces.go | 1 | ||||
-rw-r--r-- | test/e2e/restart_test.go | 2 | ||||
-rw-r--r-- | test/e2e/rm_test.go | 1 |
6 files changed, 2 insertions, 15 deletions
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 033bfbe76..de0734e9f 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -99,9 +99,8 @@ var _ = Describe("Podman pod create", func() { }) It("podman create pod with network portbindings", func() { - SkipIfRootless() name := "test" - session := podmanTest.Podman([]string{"pod", "create", "--name", name, "-p", "80:80"}) + session := podmanTest.Podman([]string{"pod", "create", "--name", name, "-p", "8080:80"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) pod := session.OutputToString() @@ -110,7 +109,7 @@ var _ = Describe("Podman pod create", func() { webserver.WaitWithDefaultTimeout() Expect(webserver.ExitCode()).To(Equal(0)) - check := SystemExec("nc", []string{"-z", "localhost", "80"}) + check := SystemExec("nc", []string{"-z", "localhost", "8080"}) Expect(check.ExitCode()).To(Equal(0)) }) diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index 3b9543566..82f35999c 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -227,7 +227,6 @@ var _ = Describe("Podman pod create", func() { }) It("podman pod container can override pod pid NS", func() { - SkipIfRootless() session := podmanTest.Podman([]string{"pod", "create", "--share", "pid"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -253,7 +252,6 @@ var _ = Describe("Podman pod create", func() { }) It("podman pod container can override pod not sharing pid", func() { - SkipIfRootless() session := podmanTest.Podman([]string{"pod", "create", "--share", "net"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -279,7 +277,6 @@ var _ = Describe("Podman pod create", func() { }) It("podman pod container can override pod ipc NS", func() { - SkipIfRootless() session := podmanTest.Podman([]string{"pod", "create", "--share", "ipc"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 6bf1c5dff..c1f7503e3 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -42,7 +42,6 @@ var _ = Describe("Podman pod kill", func() { }) It("podman pod kill a pod by id", func() { - SkipIfRootless() _, ec, podid := podmanTest.CreatePod("") Expect(ec).To(Equal(0)) @@ -61,7 +60,6 @@ var _ = Describe("Podman pod kill", func() { }) It("podman pod kill a pod by id with TERM", func() { - SkipIfRootless() _, ec, podid := podmanTest.CreatePod("") Expect(ec).To(Equal(0)) @@ -76,7 +74,6 @@ var _ = Describe("Podman pod kill", func() { }) It("podman pod kill a pod by name", func() { - SkipIfRootless() _, ec, podid := podmanTest.CreatePod("test1") Expect(ec).To(Equal(0)) @@ -105,7 +102,6 @@ var _ = Describe("Podman pod kill", func() { }) It("podman pod kill latest pod", func() { - SkipIfRootless() _, ec, podid := podmanTest.CreatePod("") Expect(ec).To(Equal(0)) @@ -131,7 +127,6 @@ var _ = Describe("Podman pod kill", func() { }) It("podman pod kill all", func() { - SkipIfRootless() _, ec, podid := podmanTest.CreatePod("") Expect(ec).To(Equal(0)) diff --git a/test/e2e/pod_pod_namespaces.go b/test/e2e/pod_pod_namespaces.go index ef9980aa9..9d6321c0e 100644 --- a/test/e2e/pod_pod_namespaces.go +++ b/test/e2e/pod_pod_namespaces.go @@ -64,7 +64,6 @@ var _ = Describe("Podman pod create", func() { }) It("podman pod container dontshare PIDNS", func() { - SkipIfRootless() session := podmanTest.Podman([]string{"pod", "create"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 935907cb0..1daf63a0e 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -156,7 +156,6 @@ var _ = Describe("Podman restart", func() { }) It("Podman restart --all", func() { - SkipIfRootless() _, exitCode, _ := podmanTest.RunLsContainer("test1") Expect(exitCode).To(Equal(0)) @@ -177,7 +176,6 @@ var _ = Describe("Podman restart", func() { }) It("Podman restart --all --running", func() { - SkipIfRootless() _, exitCode, _ := podmanTest.RunLsContainer("test1") Expect(exitCode).To(Equal(0)) diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 7e0199a17..9bf742a63 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -141,7 +141,6 @@ var _ = Describe("Podman rm", func() { }) It("podman rm bogus container", func() { - SkipIfRootless() session := podmanTest.Podman([]string{"rm", "bogus"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(1)) |