opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-14 10:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7395 from zhangguanzhang/libpod-api-returns-null

Browse Source 
fix /libpod/pods/json returns null when there are no pods
This commit is contained in:
OpenShift Merge Robot
2020-08-21 15:27:57 +02:00
committed by GitHub
parent 516196f096 fb4977b936
commit a8619bbb83
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/utils/pods.go
View File

@ -45,7 +45,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
} }
if len(pods) == 0 { if len(pods) == 0 {
return nil, nil return []*entities.ListPodsReport{}, nil
} }
lps := make([]*entities.ListPodsReport, 0, len(pods)) lps := make([]*entities.ListPodsReport, 0, len(pods))

2
test/apiv2/40-pods.at
View File

@ -3,7 +3,7 @@
# test pod-related endpoints # 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\\} t POST libpod/pods/create name=foo 201 .Id~[0-9a-f]\\{64\\}
pod_id=$(jq -r .Id <<<"$output") pod_id=$(jq -r .Id <<<"$output")