diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-30 21:06:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 21:06:11 +0200 |
| commit | 9467694a632b2f42e0bc282bc05775c09e83181c (patch) | |
| tree | 2d92ad23ac80259a623e09288dfcb80b5f88d2ea | |
| parent | 6900517f109d78ed5a9b794666b7d97782cf6ce9 (diff) | |
| parent | c3c030f55085949ca2aa704f34a4c203f8e6b079 (diff) | |
| download | podman-9467694a632b2f42e0bc282bc05775c09e83181c.tar.gz podman-9467694a632b2f42e0bc282bc05775c09e83181c.tar.bz2 podman-9467694a632b2f42e0bc282bc05775c09e83181c.zip | |
Merge pull request #6052 from sujil02/enable-prune-test
Enable prune integration test. Fixes container prune
| -rw-r--r-- | libpod/runtime_ctr.go | 3 | ||||
| -rw-r--r-- | test/e2e/prune_test.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 3dc8d3d0f..1d880531e 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -869,7 +869,8 @@ func (r *Runtime) PruneContainers(filterFuncs []ContainerFilter) (map[string]int logrus.Error(err) return false } - if state == define.ContainerStateStopped || state == define.ContainerStateExited { + if state == define.ContainerStateStopped || state == define.ContainerStateExited || + state == define.ContainerStateCreated || state == define.ContainerStateConfigured { return true } return false diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index e8a208c3c..466a4f739 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -22,7 +22,6 @@ var _ = Describe("Podman prune", func() { ) BeforeEach(func() { - Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -149,6 +148,7 @@ var _ = Describe("Podman prune", func() { It("podman system image prune unused images", func() { SkipIfRemote() + Skip(v2fail) podmanTest.RestoreAllArtifacts() podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") prune := podmanTest.PodmanNoCache([]string{"system", "prune", "-a", "--force"}) @@ -162,6 +162,7 @@ var _ = Describe("Podman prune", func() { }) It("podman system prune pods", func() { + Skip(v2fail) session := podmanTest.Podman([]string{"pod", "create"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |