Merge pull request containers#10371 from matejvasek/fix-wait-compat

fix: response of containers wait endpoint
rhatdan · May 19, 2021 · 18efc5a · 18efc5a
2 parents 4002589 + 92e8589
commit 18efc5a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
@@ -98,7 +98,7 @@ type BuildResult struct {
 
 type ContainerWaitOKBody struct {
 	StatusCode int
-	Error      struct {
+	Error      *struct {
 		Message string
 	}
 }

diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
@@ -75,18 +75,19 @@ func WaitContainerDocker(w http.ResponseWriter, r *http.Request) {
 	}
 
 	exitCode, err := waitDockerCondition(ctx, name, interval, condition)
-	msg := ""
+	var errStruct *struct{ Message string }
 	if err != nil {
 		logrus.Errorf("error while waiting on condition: %q", err)
-		msg = err.Error()
+		errStruct = &struct {
+			Message string
+		}{
+			Message: err.Error(),
+		}
 	}
+
 	responseData := handlers.ContainerWaitOKBody{
 		StatusCode: int(exitCode),
-		Error: struct {
-			Message string
-		}{
-			Message: msg,
-		},
+		Error:      errStruct,
 	}
 	enc := json.NewEncoder(w)
 	enc.SetEscapeHTML(true)

diff --git a/test/apiv2/26-containersWait.at b/test/apiv2/26-containersWait.at
@@ -21,7 +21,9 @@ t POST "containers/${CTR}/wait?condition=non-existent-cond" 400
 
 t POST "containers/${CTR}/wait?condition=not-running" 200
 
-t POST "containers/${CTR}/wait?condition=next-exit" 200 &
+t POST "containers/${CTR}/wait?condition=next-exit" 200 \
+  .StatusCode=0 \
+  .Error=null &
 child_pid=$!
 podman start "${CTR}"
 wait "${child_pid}"

diff --git a/test/apiv2/python/rest_api/test_v2_0_0_container.py b/test/apiv2/python/rest_api/test_v2_0_0_container.py
@@ -99,7 +99,7 @@ def test_prune(self):
         r = requests.post(self.podman_url + f"/v1.40/containers/{create['Id']}/wait")
         self.assertEqual(r.status_code, 200, r.text)
         wait = r.json()
-        self.assertEqual(wait["StatusCode"], 0, wait["Error"]["Message"])
+        self.assertEqual(wait["StatusCode"], 0, wait["Error"])
 
         prune = requests.post(self.podman_url + "/v1.40/containers/prune")
         self.assertEqual(prune.status_code, 200, prune.status_code)