From fb4977b936a54497434967997f61ae18a1d44373 Mon Sep 17 00:00:00 2001 From: zhangguanzhang Date: Fri, 21 Aug 2020 10:02:57 +0800 Subject: fix /libpod/pods/json returns null when there are no pods Signed-off-by: zhangguanzhang --- pkg/api/handlers/utils/pods.go | 2 +- 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") -- cgit v1.2.3-54-g00ecf