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/rm_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/rm_test.go')
| -rw-r--r-- | test/e2e/rm_test.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 764d25ba5..dab18ddff 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -123,15 +123,18 @@ var _ = Describe("Podman rm", func() { }) It("podman rm the latest container", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"create", ALPINE, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - _, ec, cid := podmanTest.RunLsContainer("") + _, ec, cid := podmanTest.RunLsContainer("test1") Expect(ec).To(Equal(0)) - result := podmanTest.Podman([]string{"rm", "-l"}) + latest := "-l" + if IsRemote() { + latest = "test1" + } + result := podmanTest.Podman([]string{"rm", latest}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) output := result.OutputToString() @@ -193,7 +196,7 @@ var _ = Describe("Podman rm", func() { }) It("podman rm invalid --latest and --cidfile and --all", func() { - SkipIfRemote() + SkipIfRemote() // Verifying --latest flag result := podmanTest.Podman([]string{"rm", "--cidfile", "foobar", "--latest"}) result.WaitWithDefaultTimeout() |