opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-05 22:31:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9912 from jmguzik/recreate-prune-until-tests-for-containers

Browse Source 
Recreate until container prune tests for bindings
This commit is contained in:
OpenShift Merge Robot
2021-04-02 14:35:10 +02:00
committed by GitHub
parent 3ae42358e1 c5beaf0e17
commit 1db9053add
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/bindings/test/containers_test.go
View File

@ -568,6 +568,35 @@ var _ = Describe("Podman containers ", func() {
Expect(err).To(BeNil())
Expect(len(reports.PruneReportsIds(pruneResponse))).To(Equal(0))
Expect(len(reports.PruneReportsErrs(pruneResponse))).To(Equal(0))
// Valid filter params container should be pruned now.
filters := map[string][]string{
"until": {"5000000000"}, //Friday, June 11, 2128
}
pruneResponse, err = containers.Prune(bt.conn, new(containers.PruneOptions).WithFilters(filters))
Expect(err).To(BeNil())
Expect(len(reports.PruneReportsErrs(pruneResponse))).To(Equal(0))
Expect(len(reports.PruneReportsIds(pruneResponse))).To(Equal(1))
})
It("podman list containers with until filter", func() {
var name = "top"
_, err := bt.RunTopContainer(&name, nil)
Expect(err).To(BeNil())
filters := map[string][]string{
"until": {"5000000000"}, //Friday, June 11, 2128
}
c, err := containers.List(bt.conn, new(containers.ListOptions).WithFilters(filters).WithAll(true))
Expect(err).To(BeNil())
Expect(len(c)).To(Equal(1))
filters = map[string][]string{
"until": {"500000"}, // Tuesday, January 6, 1970
}
c, err = containers.List(bt.conn, new(containers.ListOptions).WithFilters(filters).WithAll(true))
Expect(err).To(BeNil())
Expect(len(c)).To(Equal(0))
})
It("podman prune running containers", func() {

2
pkg/domain/filters/containers.go
View File

@ -237,7 +237,7 @@ func prepareUntilFilterFunc(filterValues []string) (func(container *libpod.Conta
return nil, err
}
return func(c *libpod.Container) bool {
if !until.IsZero() && c.CreatedTime().After((until)) {
if !until.IsZero() && c.CreatedTime().Before(until) {
return true
}
return false