diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-09 09:12:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 09:12:40 -0400 |
| commit | 1b2b068ce89a52d46cfd3191ed6bbf403e7582e9 (patch) | |
| tree | eda61379064c7e7efb0ea281c172dde9a6c1fa41 | |
| parent | 6b1a1fcc5cb92a9fd5800b0d1af44f26093a8153 (diff) | |
| parent | a4ffed91da4b7dca459edd5b187dc587dee1086d (diff) | |
| download | podman-1b2b068ce89a52d46cfd3191ed6bbf403e7582e9.tar.gz podman-1b2b068ce89a52d46cfd3191ed6bbf403e7582e9.tar.bz2 podman-1b2b068ce89a52d46cfd3191ed6bbf403e7582e9.zip | |
Merge pull request #7569 from zhangguanzhang/fix-apiv2-top-response-two-value
fix APIv2 pods top of non-exist pod gets two response value
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 2 | ||||
| -rw-r--r-- | test/apiv2/40-pods.at | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 8f8292567..82a7299b2 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -327,7 +327,7 @@ func PodTop(w http.ResponseWriter, r *http.Request) { name := utils.GetName(r) pod, err := runtime.LookupPod(name) if err != nil { - utils.ContainerNotFound(w, name, err) + utils.PodNotFound(w, name, err) return } diff --git a/test/apiv2/40-pods.at b/test/apiv2/40-pods.at index 3df541de5..fdb61a84d 100644 --- a/test/apiv2/40-pods.at +++ b/test/apiv2/40-pods.at @@ -102,6 +102,10 @@ t GET libpod/pods/stats?namesOrIDs=fakename 404 \ t DELETE libpod/pods/bar?force=true 200 +# test the fake name +t GET libpod/pods/fakename/top 404 \ + .cause="no such pod" + t GET libpod/pods/foo/top 200 \ .Processes[0][-1]="/pause " \ .Titles[-1]="COMMAND" |