2 files changed, 69 insertions, 6 deletions

diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 963f0ec57..e74a256c7 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -60,10 +60,8 @@ func List(ctx context.Context, filters map[string][]string, all *bool, last *int
 // used for more granular selection of containers.  The main error returned indicates if there were runtime
 // errors like finding containers.  Errors specific to the removal of a container are in the PruneContainerResponse
 // structure.
-func Prune(ctx context.Context, filters map[string][]string) ([]string, error) {
-	var (
-		pruneResponse []string
-	)
+func Prune(ctx context.Context, filters map[string][]string) (*entities.ContainerPruneReport, error) {
+	var reports *entities.ContainerPruneReport
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
 		return nil, err
@@ -78,9 +76,9 @@ func Prune(ctx context.Context, filters map[string][]string) ([]string, error) {
 	}
 	response, err := conn.DoRequest(nil, http.MethodPost, "/containers/prune", params)
 	if err != nil {
-		return pruneResponse, err
+		return nil, err
 	}
-	return pruneResponse, response.Process(pruneResponse)
+	return reports, response.Process(&reports)
 }
 
 // Remove removes a container from local storage.  The force bool designates
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index 0b1b9ecdd..e288dc368 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -531,4 +531,69 @@ var _ = Describe("Podman containers ", func() {
 		Expect(err).ToNot(BeNil())
 	})
 
+	It("podman prune stoped containers", func() {
+		// Start and stop a container to enter in exited state.
+		var name = "top"
+		_, err := bt.RunTopContainer(&name, &bindings.PFalse, nil)
+		Expect(err).To(BeNil())
+		err = containers.Stop(bt.conn, name, nil)
+		Expect(err).To(BeNil())
+
+		// Prune container should return no errors and one pruned container ID.
+		pruneResponse, err := containers.Prune(bt.conn, nil)
+		Expect(err).To(BeNil())
+		Expect(len(pruneResponse.Err)).To(Equal(0))
+		Expect(len(pruneResponse.ID)).To(Equal(1))
+	})
+
+	It("podman prune stoped containers with filters", func() {
+		// Start and stop a container to enter in exited state.
+		var name = "top"
+		_, err := bt.RunTopContainer(&name, &bindings.PFalse, nil)
+		Expect(err).To(BeNil())
+		err = containers.Stop(bt.conn, name, nil)
+		Expect(err).To(BeNil())
+
+		// Invalid filter keys should return error.
+		filtersIncorrect := map[string][]string{
+			"status": {"dummy"},
+		}
+		pruneResponse, err := containers.Prune(bt.conn, filtersIncorrect)
+		Expect(err).ToNot(BeNil())
+
+		// Mismatched filter params no container should be pruned.
+		filtersIncorrect = map[string][]string{
+			"name": {"r"},
+		}
+		pruneResponse, err = containers.Prune(bt.conn, filtersIncorrect)
+		Expect(err).To(BeNil())
+		Expect(len(pruneResponse.Err)).To(Equal(0))
+		Expect(len(pruneResponse.ID)).To(Equal(0))
+
+		// Valid filter params container should be pruned now.
+		filters := map[string][]string{
+			"name": {"top"},
+		}
+		pruneResponse, err = containers.Prune(bt.conn, filters)
+		Expect(err).To(BeNil())
+		Expect(len(pruneResponse.Err)).To(Equal(0))
+		Expect(len(pruneResponse.ID)).To(Equal(1))
+	})
+
+	It("podman prune running containers", func() {
+		// Start the container.
+		var name = "top"
+		_, err := bt.RunTopContainer(&name, &bindings.PFalse, nil)
+		Expect(err).To(BeNil())
+
+		// Check if the container is running.
+		data, err := containers.Inspect(bt.conn, name, nil)
+		Expect(err).To(BeNil())
+		Expect(data.State.Status).To(Equal("running"))
+
+		// Prune. Should return no error no prune response ID.
+		pruneResponse, err := containers.Prune(bt.conn, nil)
+		Expect(err).To(BeNil())
+		Expect(len(pruneResponse.ID)).To(Equal(0))
+	})
 })