diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-23 13:02:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-23 13:02:53 +0000 |
| commit | 7d273c40f5411df00666bd5d1ea1df5662a75517 (patch) | |
| tree | 8e5d9d2fe9656d62ba306bafa7ae82964250a68c /test/e2e/port_test.go | |
| parent | 5cedd830f7275e8dc3382502908b846bfa57a3b8 (diff) | |
| parent | a277b7eb0bedd24eecede1c88e58fce2dea89991 (diff) | |
| download | podman-7d273c40f5411df00666bd5d1ea1df5662a75517.tar.gz podman-7d273c40f5411df00666bd5d1ea1df5662a75517.tar.bz2 podman-7d273c40f5411df00666bd5d1ea1df5662a75517.zip | |
Merge pull request #7727 from rhatdan/attach
Examine all SkipIfRemote functions
Diffstat (limited to 'test/e2e/port_test.go')
| -rw-r--r-- | test/e2e/port_test.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index fce092e2d..a3ce8bd69 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -47,15 +47,17 @@ var _ = Describe("Podman port", func() { }) It("podman port -l nginx", func() { - SkipIfRemote() - session, cid := podmanTest.RunNginxWithHealthCheck("") + session, cid := podmanTest.RunNginxWithHealthCheck("test1") Expect(session.ExitCode()).To(Equal(0)) if err := podmanTest.RunHealthCheck(cid); err != nil { Fail(err.Error()) } - result := podmanTest.Podman([]string{"port", "-l"}) + if !IsRemote() { + cid = "-l" + } + result := podmanTest.Podman([]string{"port", cid}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) port := strings.Split(result.OutputToStringArray()[0], ":")[1] @@ -63,7 +65,6 @@ var _ = Describe("Podman port", func() { }) It("podman container port -l nginx", func() { - SkipIfRemote() session, cid := podmanTest.RunNginxWithHealthCheck("") Expect(session.ExitCode()).To(Equal(0)) @@ -71,7 +72,10 @@ var _ = Describe("Podman port", func() { Fail(err.Error()) } - result := podmanTest.Podman([]string{"container", "port", "-l"}) + if !IsRemote() { + cid = "-l" + } + result := podmanTest.Podman([]string{"container", "port", cid}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) port := strings.Split(result.OutputToStringArray()[0], ":")[1] @@ -79,7 +83,6 @@ var _ = Describe("Podman port", func() { }) It("podman port -l port nginx", func() { - SkipIfRemote() session, cid := podmanTest.RunNginxWithHealthCheck("") Expect(session.ExitCode()).To(Equal(0)) @@ -87,7 +90,10 @@ var _ = Describe("Podman port", func() { Fail(err.Error()) } - result := podmanTest.Podman([]string{"port", "-l", "80"}) + if !IsRemote() { + cid = "-l" + } + result := podmanTest.Podman([]string{"port", cid, "80"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) port := strings.Split(result.OutputToStringArray()[0], ":")[1] |