diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-30 10:41:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-30 10:41:10 +0100 |
commit | 76019c31f535c6473e5f7d645cf42ca4477e2c33 (patch) | |
tree | e2d595054ce380b5074bf0217e0c405ded94178a /test/e2e/prune_test.go | |
parent | ad5579e1d9905996612dd135467ee2ee5f62b7d3 (diff) | |
parent | 656033ca969477ed809cbed57e752f959899d4f8 (diff) | |
download | podman-76019c31f535c6473e5f7d645cf42ca4477e2c33.tar.gz podman-76019c31f535c6473e5f7d645cf42ca4477e2c33.tar.bz2 podman-76019c31f535c6473e5f7d645cf42ca4477e2c33.zip |
Merge pull request #2205 from baude/prunelikedocker
podman image prune -- implement all flag
Diffstat (limited to 'test/e2e/prune_test.go')
-rw-r--r-- | test/e2e/prune_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 50a279232..81fb82b20 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -1,5 +1,3 @@ -// +build !remoteclient - package integration import ( @@ -41,6 +39,7 @@ var _ = Describe("Podman rm", func() { }) It("podman container prune containers", func() { + SkipIfRemote() top := podmanTest.RunTopContainer("") top.WaitWithDefaultTimeout() Expect(top.ExitCode()).To(Equal(0)) @@ -57,6 +56,7 @@ var _ = Describe("Podman rm", func() { }) It("podman image prune none images", func() { + SkipIfRemote() podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") none := podmanTest.Podman([]string{"images", "-a"}) @@ -74,10 +74,11 @@ var _ = Describe("Podman rm", func() { Expect(none.ExitCode()).To(Equal(0)) hasNoneAfter, _ := after.GrepString("<none>") Expect(hasNoneAfter).To(BeFalse()) + Expect(len(after.OutputToStringArray()) > 1).To(BeTrue()) }) It("podman image prune unused images", func() { - prune := podmanTest.Podman([]string{"image", "prune"}) + prune := podmanTest.Podman([]string{"image", "prune", "-a"}) prune.WaitWithDefaultTimeout() Expect(prune.ExitCode()).To(Equal(0)) |