set binding tests to required

some small fix ups for binding tests and then make them required.

update containers-common

V2 bindings tests were failing because of changes introduced in commit
a2ad5bb.

Fix some typos.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

in the case where the specgen attribute for Env and Labels are nil, we should should then make the map IF we have labels and envs that need to be added.

Signed-off-by: Brent Baude <bbaude@redhat.com>

5 files changed, 55 insertions, 43 deletions

diff --git a/pkg/bindings/manifests/manifests.go b/pkg/bindings/manifests/manifests.go
index b85169410..3e0ef0325 100644
--- a/pkg/bindings/manifests/manifests.go
+++ b/pkg/bindings/manifests/manifests.go
@@ -125,23 +125,24 @@ func Push(ctx context.Context, name string, destination *string, all *bool) (str
 	return idr.ID, response.Process(&idr)
 }
 
+// There is NO annotate endpoint.  this binding could never work
 // Annotate updates the image configuration of a given manifest list
-func Annotate(ctx context.Context, name, digest string, options image.ManifestAnnotateOpts) (string, error) {
-	var idr handlers.IDResponse
-	conn, err := bindings.GetClient(ctx)
-	if err != nil {
-		return "", err
-	}
-	params := url.Values{}
-	params.Set("digest", digest)
-	optionsString, err := jsoniter.MarshalToString(options)
-	if err != nil {
-		return "", err
-	}
-	stringReader := strings.NewReader(optionsString)
-	response, err := conn.DoRequest(stringReader, http.MethodPost, "/manifests/%s/annotate", params, name)
-	if err != nil {
-		return "", err
-	}
-	return idr.ID, response.Process(&idr)
-}
+//func Annotate(ctx context.Context, name, digest string, options image.ManifestAnnotateOpts) (string, error) {
+//	var idr handlers.IDResponse
+//	conn, err := bindings.GetClient(ctx)
+//	if err != nil {
+//		return "", err
+//	}
+//	params := url.Values{}
+//	params.Set("digest", digest)
+//	optionsString, err := jsoniter.MarshalToString(options)
+//	if err != nil {
+//		return "", err
+//	}
+//	stringReader := strings.NewReader(optionsString)
+//	response, err := conn.DoRequest(stringReader, http.MethodPost, "/manifests/%s/annotate", params, name)
+//	if err != nil {
+//		return "", err
+//	}
+//	return idr.ID, response.Process(&idr)
+//}
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index c79d89b73..f40d8ce46 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -531,7 +531,7 @@ var _ = Describe("Podman containers ", func() {
 		Expect(err).ToNot(BeNil())
 	})
 
-	It("podman prune stoped containers", func() {
+	It("podman prune stopped containers", func() {
 		// Start and stop a container to enter in exited state.
 		var name = "top"
 		_, err := bt.RunTopContainer(&name, &bindings.PFalse, nil)
@@ -546,7 +546,7 @@ var _ = Describe("Podman containers ", func() {
 		Expect(len(pruneResponse.ID)).To(Equal(1))
 	})
 
-	It("podman prune stoped containers with filters", func() {
+	It("podman prune stopped containers with filters", func() {
 		// Start and stop a container to enter in exited state.
 		var name = "top"
 		_, err := bt.RunTopContainer(&name, &bindings.PFalse, nil)
diff --git a/pkg/bindings/test/manifests_test.go b/pkg/bindings/test/manifests_test.go
index ddb75865c..71d626b7b 100644
--- a/pkg/bindings/test/manifests_test.go
+++ b/pkg/bindings/test/manifests_test.go
@@ -118,25 +118,27 @@ var _ = Describe("Podman containers ", func() {
 		Expect(len(data.Manifests)).To(BeZero())
 	})
 
-	It("annotate manifest", func() {
-		id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
-		Expect(err).To(BeNil())
-		opts := image.ManifestAddOpts{Images: []string{"docker.io/library/alpine:latest"}}
-
-		_, err = manifests.Add(bt.conn, id, opts)
-		Expect(err).To(BeNil())
-		data, err := manifests.Inspect(bt.conn, id)
-		Expect(err).To(BeNil())
-		Expect(len(data.Manifests)).To(BeNumerically("==", 1))
-		digest := data.Manifests[0].Digest.String()
-		annoOpts := image.ManifestAnnotateOpts{OS: "foo"}
-		_, err = manifests.Annotate(bt.conn, id, digest, annoOpts)
-		Expect(err).To(BeNil())
-		list, err := manifests.Inspect(bt.conn, id)
-		Expect(err).To(BeNil())
-		Expect(len(list.Manifests)).To(BeNumerically("==", 1))
-		Expect(list.Manifests[0].Platform.OS).To(Equal("foo"))
-	})
+	// There is NO annotate endpoint, this could never work.:w
+
+	//It("annotate manifest", func() {
+	//	id, err := manifests.Create(bt.conn, []string{"quay.io/libpod/foobar:latest"}, []string{}, nil)
+	//	Expect(err).To(BeNil())
+	//	opts := image.ManifestAddOpts{Images: []string{"docker.io/library/alpine:latest"}}
+	//
+	//	_, err = manifests.Add(bt.conn, id, opts)
+	//	Expect(err).To(BeNil())
+	//	data, err := manifests.Inspect(bt.conn, id)
+	//	Expect(err).To(BeNil())
+	//	Expect(len(data.Manifests)).To(BeNumerically("==", 1))
+	//	digest := data.Manifests[0].Digest.String()
+	//	annoOpts := image.ManifestAnnotateOpts{OS: "foo"}
+	//	_, err = manifests.Annotate(bt.conn, id, digest, annoOpts)
+	//	Expect(err).To(BeNil())
+	//	list, err := manifests.Inspect(bt.conn, id)
+	//	Expect(err).To(BeNil())
+	//	Expect(len(list.Manifests)).To(BeNumerically("==", 1))
+	//	Expect(list.Manifests[0].Platform.OS).To(Equal("foo"))
+	//})
 
 	It("push manifest", func() {
 		Skip("TODO")
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 8a0b9c7a6..49bbfa246 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -57,6 +57,11 @@ var _ = Describe("Podman pods", func() {
 		podSummary, err := pods.List(bt.conn, nil)
 		Expect(err).To(BeNil())
 		Expect(len(podSummary)).To(Equal(1))
+
+		// Start the pod
+		_, err = pods.Start(bt.conn, newpod)
+		Expect(err).To(BeNil())
+
 		// Adding an alpine container to the existing pod
 		_, err = bt.RunTopContainer(nil, &bindings.PTrue, &newpod)
 		Expect(err).To(BeNil())
@@ -83,6 +88,11 @@ var _ = Describe("Podman pods", func() {
 	It("List pods with filters", func() {
 		newpod2 := "newpod2"
 		bt.Podcreate(&newpod2)
+
+		// Start the pod
+		_, err = pods.Start(bt.conn, newpod)
+		Expect(err).To(BeNil())
+
 		_, err = bt.RunTopContainer(nil, &bindings.PTrue, &newpod)
 		Expect(err).To(BeNil())
 
diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go
index 87e6d56dc..62ea32377 100644
--- a/pkg/bindings/test/system_test.go
+++ b/pkg/bindings/test/system_test.go
@@ -3,7 +3,6 @@ package test_bindings
 import (
 	"time"
 
-	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/bindings/pods"
@@ -39,8 +38,8 @@ var _ = Describe("Podman system", func() {
 	})
 
 	It("podman events", func() {
-		eChan := make(chan handlers.Event, 1)
-		var messages []handlers.Event
+		eChan := make(chan entities.Event, 1)
+		var messages []entities.Event
 		cancelChan := make(chan bool, 1)
 		go func() {
 			for e := range eChan {