diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 10:09:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 10:09:09 -0700 |
| commit | 5b4e91db73a80f31f67b7c28832527e64b074b74 (patch) | |
| tree | c138a694b405e3ba72c11d570cb8494851ae19ef /test | |
| parent | 38c4b9bcc0296a1fe7efc5bb6058e8aaa5ecae6f (diff) | |
| parent | 664e0595dda658093f72673d8df8c32760b9845f (diff) | |
| download | podman-5b4e91db73a80f31f67b7c28832527e64b074b74.tar.gz podman-5b4e91db73a80f31f67b7c28832527e64b074b74.tar.bz2 podman-5b4e91db73a80f31f67b7c28832527e64b074b74.zip | |
Merge pull request #6174 from giuseppe/fix-events-rootless
rootless: do not set pids limits with cgroupfs
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/events_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/run_networking_test.go | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 4cd5de05e..0636af74c 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -19,7 +19,6 @@ var _ = Describe("Podman events", func() { ) BeforeEach(func() { - SkipIfRootlessV2() tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 6a93da085..9db2f5d49 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -19,7 +19,6 @@ var _ = Describe("Podman run networking", func() { ) BeforeEach(func() { - SkipIfRootlessV2() tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -193,6 +192,8 @@ var _ = Describe("Podman run networking", func() { }) It("podman run network expose duplicate host port results in error", func() { + SkipIfRootless() + session := podmanTest.Podman([]string{"run", "-dt", "-p", "80", ALPINE, "/bin/sh"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -202,7 +203,7 @@ var _ = Describe("Podman run networking", func() { Expect(inspect.ExitCode()).To(Equal(0)) containerConfig := inspect.InspectContainerToJSON() - Expect(containerConfig[0].NetworkSettings.Ports[0].HostPort).ToNot(Equal("80")) + Expect(containerConfig[0].NetworkSettings.Ports[0].HostPort).ToNot(Equal(80)) }) It("podman run hostname test", func() { |