Recreate until container prune tests for bindings

Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>

<MH: Fixed cherry-pick conflicts>

Signed-off-by: Matthew Heon <mheon@redhat.com>

2 files changed, 22 insertions, 2 deletions

diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index cb9e0721b..4d1361746 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -571,7 +571,7 @@ var _ = Describe("Podman containers ", func() {
 
 		// Valid filter params container should be pruned now.
 		filters := map[string][]string{
-			"until": {"0s"},
+			"until": {"5000000000"}, //Friday, June 11, 2128
 		}
 		pruneResponse, err = containers.Prune(bt.conn, new(containers.PruneOptions).WithFilters(filters))
 		Expect(err).To(BeNil())
@@ -579,6 +579,26 @@ var _ = Describe("Podman containers ", func() {
 		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() {
 		// Start the container.
 		var name = "top"
diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go
index 19d704da1..45791cd84 100644
--- a/pkg/domain/filters/containers.go
+++ b/pkg/domain/filters/containers.go
@@ -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