diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-21 16:26:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 16:26:08 +0000 |
| commit | 588d8ec371202b5f6101c11f4c3e2952c2843d85 (patch) | |
| tree | d70723be0e4054ae353f665b21f3b78d0a95350f | |
| parent | 79eb467325dc8ff50fecce1f69b17181168fb945 (diff) | |
| parent | bb5bd09eade239dda07332a887d0fafb6e29ee87 (diff) | |
| download | podman-588d8ec371202b5f6101c11f4c3e2952c2843d85.tar.gz podman-588d8ec371202b5f6101c11f4c3e2952c2843d85.tar.bz2 podman-588d8ec371202b5f6101c11f4c3e2952c2843d85.zip | |
Merge pull request #14662 from Luap99/api-json
API: containers/json always set application/json content type
| -rw-r--r-- | pkg/api/handlers/libpod/containers.go | 4 | ||||
| -rw-r--r-- | test/apiv2/20-containers.at | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 6b5bee403..deddcaf93 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -115,10 +115,6 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { utils.InternalServerError(w, err) return } - if len(pss) == 0 { - utils.WriteResponse(w, http.StatusOK, "[]") - return - } utils.WriteResponse(w, http.StatusOK, pss) } diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 2f48e188e..cfd6aab33 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -16,7 +16,12 @@ podman pull $ENV_WORKDIR_IMG &>/dev/null # Ensure clean slate podman rm -a -f &>/dev/null -t GET "libpod/containers/json (at start: clean slate)" 200 length=0 +t GET "libpod/containers/json (at start: clean slate)" 200 \ + "[]" \ + length=0 +# check content type: https://github.com/containers/podman/issues/14647 +response_headers=$(cat "$WORKDIR/curl.headers.out") +like "$response_headers" ".*Content-Type: application/json.*" "header does not contain application/json" # Regression test for #12904 (race condition in logging code) mytext="hi-there-$(random_string 15)" |