diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-23 15:45:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-23 15:45:26 +0100 |
commit | 48b3143656bde2163025d43a8a9b2c88208ffee8 (patch) | |
tree | 75052f7a8355af08f37d23a89ae90f80b030466b /test | |
parent | b743f60a4b9e51a5fad1b1ba7cb28f9a7f1a7d2c (diff) | |
parent | abb60fbba2d4e9f4795d5be8a14001e8a72ec7d7 (diff) | |
download | podman-48b3143656bde2163025d43a8a9b2c88208ffee8.tar.gz podman-48b3143656bde2163025d43a8a9b2c88208ffee8.tar.bz2 podman-48b3143656bde2163025d43a8a9b2c88208ffee8.zip |
Merge pull request #5436 from QiWang19/rm_created_ctr
container prune remove state created, configured
Diffstat (limited to 'test')
-rw-r--r-- | test/e2e/prune_test.go | 28 | ||||
-rw-r--r-- | test/e2e/volume_prune_test.go | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index c9b01ad4a..672b0e103 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -59,6 +59,34 @@ var _ = Describe("Podman prune", func() { Expect(podmanTest.NumberOfContainers()).To(Equal(1)) }) + It("podman container prune after create containers", func() { + create := podmanTest.Podman([]string{"create", "--name", "test", BB}) + create.WaitWithDefaultTimeout() + Expect(create.ExitCode()).To(Equal(0)) + + prune := podmanTest.Podman([]string{"container", "prune", "-f"}) + prune.WaitWithDefaultTimeout() + Expect(prune.ExitCode()).To(Equal(0)) + + Expect(podmanTest.NumberOfContainers()).To(Equal(0)) + }) + + It("podman container prune after create & init containers", func() { + create := podmanTest.Podman([]string{"create", "--name", "test", BB}) + create.WaitWithDefaultTimeout() + Expect(create.ExitCode()).To(Equal(0)) + + init := podmanTest.Podman([]string{"init", "test"}) + init.WaitWithDefaultTimeout() + Expect(init.ExitCode()).To(Equal(0)) + + prune := podmanTest.Podman([]string{"container", "prune", "-f"}) + prune.WaitWithDefaultTimeout() + Expect(prune.ExitCode()).To(Equal(0)) + + Expect(podmanTest.NumberOfContainers()).To(Equal(0)) + }) + It("podman image prune none images", func() { SkipIfRemote() podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index ba249278b..3049646b0 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -89,7 +89,7 @@ var _ = Describe("Podman volume prune", func() { session = podmanTest.Podman([]string{"volume", "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(len(session.OutputToStringArray())).To(Equal(2)) + Expect(len(session.OutputToStringArray())).To(Equal(0)) podmanTest.Cleanup() }) |