4 files changed, 64 insertions, 12 deletions
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index ba5f9c3aa..289debd8c 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -109,7 +109,7 @@ func NewConnection(ctx context.Context, uri string, identity ...string) (context
 		}
 		client, err = tcpClient(_url)
 	default:
-		return nil, errors.Errorf("%s is not a support schema", _url.Scheme)
+		return nil, errors.Errorf("'%s' is not a supported schema", _url.Scheme)
 	}
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to create %sClient", _url.Scheme)
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index a4d065a14..5cd8f7e4f 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -152,7 +152,7 @@ func (b *bindingTest) startAPIService() *gexec.Session {
 	var (
 		cmd []string
 	)
-	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=999999", b.sock)
+	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=0", b.sock)
 	return b.runPodman(cmd)
 }
 
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 7e29265b7..f6c4d465d 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -76,15 +76,66 @@ var _ = Describe("Podman pods", func() {
 		}
 		Expect(StringInSlice(newpod, names)).To(BeTrue())
 		Expect(StringInSlice("newpod2", names)).To(BeTrue())
+	})
 
-		// TODO not working  Because: code to list based on filter
-		// "not yet implemented",
-		// Validate list pod with filters
-		//filters := make(map[string][]string)
-		//filters["name"] = []string{newpod}
-		//filteredPods, err := pods.List(bt.conn, filters)
-		//Expect(err).To(BeNil())
-		//Expect(len(filteredPods)).To(BeNumerically("==", 1))
+	// The test validates the list pod endpoint with passing filters as the params.
+	It("List pods with filters", func() {
+		var newpod2 string = "newpod2"
+		bt.Podcreate(&newpod2)
+		_, err = bt.RunTopContainer(nil, &trueFlag, &newpod)
+		Expect(err).To(BeNil())
+
+		// Expected err with invalid filter params
+		filters := make(map[string][]string)
+		filters["dummy"] = []string{"dummy"}
+		filteredPods, err := pods.List(bt.conn, filters)
+		Expect(err).ToNot(BeNil())
+		code, _ := bindings.CheckResponseCode(err)
+		Expect(code).To(BeNumerically("==", http.StatusInternalServerError))
+
+		// Expected empty response with invalid filters
+		filters = make(map[string][]string)
+		filters["name"] = []string{"dummy"}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 0))
+
+		// Validate list pod with name filter
+		filters = make(map[string][]string)
+		filters["name"] = []string{newpod2}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		var names []string
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod2", names)).To(BeTrue())
+
+		// Validate list pod with id filter
+		filters = make(map[string][]string)
+		response, err := pods.Inspect(bt.conn, newpod)
+		id := response.Config.ID
+		filters["id"] = []string{id}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		names = names[:0]
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod", names)).To(BeTrue())
+
+		// Using multiple filters
+		filters["name"] = []string{newpod}
+		filteredPods, err = pods.List(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(filteredPods)).To(BeNumerically("==", 1))
+		names = names[:0]
+		for _, i := range filteredPods {
+			names = append(names, i.Config.Name)
+		}
+		Expect(StringInSlice("newpod", names)).To(BeTrue())
 	})
 
 	// The test validates if the exists responds
diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go
index c8940d46e..b1a742c43 100644
--- a/pkg/bindings/test/volumes_test.go
+++ b/pkg/bindings/test/volumes_test.go
@@ -3,11 +3,12 @@ package test_bindings
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/bindings/volumes"
-	"net/http"
-	"time"
 
 	"github.com/containers/libpod/pkg/bindings"
 	. "github.com/onsi/ginkgo"