Merge pull request #5639 from vrothberg/v2-pod-top

V2 pod top

2 files changed, 33 insertions, 3 deletions

diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index 9dd9cb707..a31181958 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -387,15 +387,15 @@ var _ = Describe("Podman containers ", func() {
 		Expect(err).To(BeNil())
 
 		// By name
-		output, err := containers.Top(bt.conn, name, nil)
+		_, err = containers.Top(bt.conn, name, nil)
 		Expect(err).To(BeNil())
 
 		// By id
-		output, err = containers.Top(bt.conn, cid, nil)
+		_, err = containers.Top(bt.conn, cid, nil)
 		Expect(err).To(BeNil())
 
 		// With descriptors
-		output, err = containers.Top(bt.conn, cid, []string{"user,pid,hpid"})
+		output, err := containers.Top(bt.conn, cid, []string{"user,pid,hpid"})
 		Expect(err).To(BeNil())
 		header := strings.Split(output[0], "\t")
 		for _, d := range []string{"USER", "PID", "HPID"} {
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 0f786e341..2599ec7ef 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -2,6 +2,7 @@ package test_bindings
 
 import (
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/containers/libpod/libpod/define"
@@ -319,4 +320,33 @@ var _ = Describe("Podman pods", func() {
 		Expect(err).To(BeNil())
 		Expect(exists).To(BeTrue())
 	})
+
+	// Test validates the pod top bindings
+	It("pod top", func() {
+		var name string = "podA"
+
+		bt.Podcreate(&name)
+		_, err := pods.Start(bt.conn, name)
+		Expect(err).To(BeNil())
+
+		// By name
+		_, err = pods.Top(bt.conn, name, nil)
+		Expect(err).To(BeNil())
+
+		// With descriptors
+		output, err := pods.Top(bt.conn, name, []string{"user,pid,hpid"})
+		Expect(err).To(BeNil())
+		header := strings.Split(output[0], "\t")
+		for _, d := range []string{"USER", "PID", "HPID"} {
+			Expect(d).To(BeElementOf(header))
+		}
+
+		// With bogus ID
+		_, err = pods.Top(bt.conn, "IdoNotExist", nil)
+		Expect(err).ToNot(BeNil())
+
+		// With bogus descriptors
+		_, err = pods.Top(bt.conn, name, []string{"Me,Neither"})
+		Expect(err).ToNot(BeNil())
+	})
 })