diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-03 15:30:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 15:30:39 -0500 |
commit | 4e1bcf30f3a519490f58d66bc0aef16676f61ae8 (patch) | |
tree | 1c385d7d3165aac114aa1d812ecd06cadba89bf6 /test/e2e/pod_prune_test.go | |
parent | 4a1614e73feee048941296716dd85ceb6d15417d (diff) | |
parent | 7e4d696d949f4132c17a9c66c9f24e65b184be4c (diff) | |
download | podman-4e1bcf30f3a519490f58d66bc0aef16676f61ae8.tar.gz podman-4e1bcf30f3a519490f58d66bc0aef16676f61ae8.tar.bz2 podman-4e1bcf30f3a519490f58d66bc0aef16676f61ae8.zip |
Merge pull request #9188 from jwhonce/issues/8865
Report StatusConflict on Pod opt partial failures
Diffstat (limited to 'test/e2e/pod_prune_test.go')
-rw-r--r-- | test/e2e/pod_prune_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index 0346cfdc8..d1ebf7249 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman pod prune", func() { }) It("podman pod prune empty pod", func() { - _, ec, _ := podmanTest.CreatePod("") + _, ec, _ := podmanTest.CreatePod(nil) Expect(ec).To(Equal(0)) result := podmanTest.Podman([]string{"pod", "prune", "--force"}) @@ -42,7 +42,7 @@ var _ = Describe("Podman pod prune", func() { }) It("podman pod prune doesn't remove a pod with a running container", func() { - _, ec, podid := podmanTest.CreatePod("") + _, ec, podid := podmanTest.CreatePod(nil) Expect(ec).To(Equal(0)) ec2 := podmanTest.RunTopContainerInPod("", podid) @@ -59,7 +59,7 @@ var _ = Describe("Podman pod prune", func() { }) It("podman pod prune removes a pod with a stopped container", func() { - _, ec, podid := podmanTest.CreatePod("") + _, ec, podid := podmanTest.CreatePod(nil) Expect(ec).To(Equal(0)) _, ec2, _ := podmanTest.RunLsContainerInPod("", podid) |