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/stop_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/stop_test.go')
| -rw-r--r-- | test/e2e/stop_test.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 84274b3ff..75b915550 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -182,7 +182,7 @@ var _ = Describe("Podman stop", func() { }) It("podman stop latest containers", func() { - SkipIfRemote() + SkipIfRemote() // Testing --latest session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -196,14 +196,17 @@ var _ = Describe("Podman stop", func() { }) It("podman stop all containers with one stopped", func() { - Skip(v2remotefail) session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) session2 := podmanTest.RunTopContainer("test2") session2.WaitWithDefaultTimeout() Expect(session2.ExitCode()).To(Equal(0)) - session3 := podmanTest.Podman([]string{"stop", "-l", "-t", "1"}) + cid := "-l" + if IsRemote() { + cid = "test2" + } + session3 := podmanTest.Podman([]string{"stop", cid, "-t", "1"}) session3.WaitWithDefaultTimeout() Expect(session3.ExitCode()).To(Equal(0)) session4 := podmanTest.Podman([]string{"stop", "-a", "-t", "1"}) @@ -286,7 +289,7 @@ var _ = Describe("Podman stop", func() { }) It("podman stop invalid --latest and --cidfile and --all", func() { - SkipIfRemote() + SkipIfRemote() // testing --latest result := podmanTest.Podman([]string{"stop", "--cidfile", "foobar", "--latest"}) result.WaitWithDefaultTimeout() |