summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-16 17:01:50 +0100
committerGitHub <noreply@github.com>2021-12-16 17:01:50 +0100
commit273da42af237dde44d34d215dfafa33f0b76d9ab (patch)
treef00c6dbfe8c2ffd47bed20fb8415f6ef4c8b859d
parentb9141c06f0350c0ec53b8dc3246d1dbd5c72e2a9 (diff)
parentf241efb17993a3234008ed95e899ad1ae849fca0 (diff)
downloadpodman-273da42af237dde44d34d215dfafa33f0b76d9ab.tar.gz
podman-273da42af237dde44d34d215dfafa33f0b76d9ab.tar.bz2
podman-273da42af237dde44d34d215dfafa33f0b76d9ab.zip
Merge pull request #12606 from vrothberg/fix-12441
bindings rmi test: clarify behavior
-rw-r--r--pkg/bindings/test/images_test.go16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go
index 8489e6ff1..4ee824472 100644
--- a/pkg/bindings/test/images_test.go
+++ b/pkg/bindings/test/images_test.go
@@ -85,14 +85,16 @@ var _ = Describe("Podman images", func() {
// Test to validate the remove image api
It("remove image", func() {
- // Remove invalid image should be a 404
+ // NOTE that removing an image that does not exist will still
+ // return a 200 http status. The response, however, includes
+ // the exit code that podman-remote should exit with.
+ //
+ // The libpod/images/remove endpoint supports batch removal of
+ // images for performance reasons and for hiding the logic of
+ // deciding which exit code to use from the client.
response, errs := images.Remove(bt.conn, []string{"foobar5000"}, nil)
Expect(len(errs)).To(BeNumerically(">", 0))
- code, _ := bindings.CheckResponseCode(errs[0])
- // FIXME FIXME FIXME: #12441: THIS IS BROKEN
- // FIXME FIXME FIXME: we get msg: "foobar5000: image not known"
- // FIXME FIXME FIXME: ...with no ResponseCode
- Expect(code).To(BeNumerically("==", -1))
+ Expect(response.ExitCode).To(BeNumerically("==", 1)) // podman-remote would exit with 1
// Remove an image by name, validate image is removed and error is nil
inspectData, err := images.GetImage(bt.conn, busybox.shortName, nil)
@@ -102,7 +104,7 @@ var _ = Describe("Podman images", func() {
Expect(inspectData.ID).To(Equal(response.Deleted[0]))
inspectData, err = images.GetImage(bt.conn, busybox.shortName, nil)
- code, _ = bindings.CheckResponseCode(err)
+ code, _ := bindings.CheckResponseCode(err)
Expect(code).To(BeNumerically("==", http.StatusNotFound))
// Start a container with alpine image