diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-21 15:27:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 15:27:57 +0200 |
| commit | a8619bbb832646a816a138e0656ca6abdc9ad04e (patch) | |
| tree | 111c5a5122e76d8f91921b69b32e00d02e4c0e96 | |
| parent | 516196f09677819b72d03e068fb8094b28e273aa (diff) | |
| parent | fb4977b936a54497434967997f61ae18a1d44373 (diff) | |
| download | podman-a8619bbb832646a816a138e0656ca6abdc9ad04e.tar.gz podman-a8619bbb832646a816a138e0656ca6abdc9ad04e.tar.bz2 podman-a8619bbb832646a816a138e0656ca6abdc9ad04e.zip | |
Merge pull request #7395 from zhangguanzhang/libpod-api-returns-null
fix /libpod/pods/json returns null when there are no pods
| -rw-r--r-- | pkg/api/handlers/utils/pods.go | 2 | ||||
| -rw-r--r-- | test/apiv2/40-pods.at | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go index 8276fb55e..54ebe2d29 100644 --- a/pkg/api/handlers/utils/pods.go +++ b/pkg/api/handlers/utils/pods.go @@ -45,7 +45,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport } if len(pods) == 0 { - return nil, nil + return []*entities.ListPodsReport{}, nil } lps := make([]*entities.ListPodsReport, 0, len(pods)) diff --git a/test/apiv2/40-pods.at b/test/apiv2/40-pods.at index 9b8ff04f0..3df541de5 100644 --- a/test/apiv2/40-pods.at +++ b/test/apiv2/40-pods.at @@ -3,7 +3,7 @@ # test pod-related endpoints # -t GET "libpod/pods/json (clean slate at start)" 200 null +t GET "libpod/pods/json (clean slate at start)" 200 '[]' t POST libpod/pods/create name=foo 201 .Id~[0-9a-f]\\{64\\} pod_id=$(jq -r .Id <<<"$output") |