Report StatusConflict on Pod opt partial failures

- When one or more containers in the Pod reports an error on an operation
report StatusConflict and report the error(s)

- jsoniter type encoding used to marshal error as string using error.Error()

- Update test framework to allow setting any flag when creating pods

- Fix test_resize() result check

Fixes #8865

Signed-off-by: Jhon Honce <jhonce@redhat.com>

<MH: Fix cherry-pick conflicts>

Signed-off-by: Matthew Heon <matthew.heon@pm.me>

1 files changed, 12 insertions, 12 deletions

diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go
index 24e945d5a..40a903cd0 100644
--- a/test/e2e/pod_rm_test.go
+++ b/test/e2e/pod_rm_test.go
@@ -37,7 +37,7 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman pod rm empty pod", func() {
-		_, ec, podid := podmanTest.CreatePod("")
+		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		result := podmanTest.Podman([]string{"pod", "rm", podid})
@@ -61,10 +61,10 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman pod rm latest pod", func() {
-		_, ec, podid := podmanTest.CreatePod("")
+		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
-		_, ec2, podid2 := podmanTest.CreatePod("pod2")
+		_, ec2, podid2 := podmanTest.CreatePod(map[string][]string{"--name": {"pod2"}})
 		Expect(ec2).To(Equal(0))
 
 		latest := "--latest"
@@ -83,7 +83,7 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman pod rm removes a pod with a container", func() {
-		_, ec, podid := podmanTest.CreatePod("")
+		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		_, ec2, _ := podmanTest.RunLsContainerInPod("", podid)
@@ -99,7 +99,7 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman pod rm -f does remove a running container", func() {
-		_, ec, podid := podmanTest.CreatePod("")
+		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		session := podmanTest.RunTopContainerInPod("", podid)
@@ -117,10 +117,10 @@ var _ = Describe("Podman pod rm", func() {
 
 	It("podman pod rm -a doesn't remove a running container", func() {
 		fmt.Printf("To start, there are %d pods\n", podmanTest.NumberOfPods())
-		_, ec, podid1 := podmanTest.CreatePod("")
+		_, ec, podid1 := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
-		_, ec, _ = podmanTest.CreatePod("")
+		_, ec, _ = podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 		fmt.Printf("Started %d pods\n", podmanTest.NumberOfPods())
 
@@ -154,13 +154,13 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman pod rm -fa removes everything", func() {
-		_, ec, podid1 := podmanTest.CreatePod("")
+		_, ec, podid1 := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
-		_, ec, podid2 := podmanTest.CreatePod("")
+		_, ec, podid2 := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
-		_, ec, _ = podmanTest.CreatePod("")
+		_, ec, _ = podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		session := podmanTest.RunTopContainerInPod("", podid1)
@@ -199,7 +199,7 @@ var _ = Describe("Podman pod rm", func() {
 	})
 
 	It("podman rm bogus pod and a running pod", func() {
-		_, ec, podid1 := podmanTest.CreatePod("")
+		_, ec, podid1 := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		session := podmanTest.RunTopContainerInPod("test1", podid1)
@@ -217,7 +217,7 @@ var _ = Describe("Podman pod rm", func() {
 
 	It("podman rm --ignore bogus pod and a running pod", func() {
 
-		_, ec, podid1 := podmanTest.CreatePod("")
+		_, ec, podid1 := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
 		session := podmanTest.RunTopContainerInPod("test1", podid1)