summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2021-04-07 13:55:03 -0700
committerJhon Honce <jhonce@redhat.com>2021-04-08 08:59:37 -0700
commit6cc0dc44ecfa6fe328772a3ad946f759ee6d6491 (patch)
tree43e34164d988a2eecb0ab7748602588f55a69c92
parent8c0df1c44a496d30b6e122c4ebc1dae9b5059607 (diff)
downloadpodman-6cc0dc44ecfa6fe328772a3ad946f759ee6d6491.tar.gz
podman-6cc0dc44ecfa6fe328772a3ad946f759ee6d6491.tar.bz2
podman-6cc0dc44ecfa6fe328772a3ad946f759ee6d6491.zip
Add missing return
libpod df handler missing a return after writing error to client. This caused a null to be appended to JSON and crashed python decoder. Signed-off-by: Jhon Honce <jhonce@redhat.com>
-rw-r--r--pkg/api/handlers/libpod/system.go1
-rw-r--r--test/apiv2/rest_api/test_rest_v2_0_0.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index 02457eb8f..2b4cef1bb 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -72,6 +72,7 @@ func DiskUsage(w http.ResponseWriter, r *http.Request) {
response, err := ic.SystemDf(r.Context(), options)
if err != nil {
utils.InternalServerError(w, err)
+ return
}
utils.WriteResponse(w, http.StatusOK, response)
}
diff --git a/test/apiv2/rest_api/test_rest_v2_0_0.py b/test/apiv2/rest_api/test_rest_v2_0_0.py
index d7910f555..e3874c182 100644
--- a/test/apiv2/rest_api/test_rest_v2_0_0.py
+++ b/test/apiv2/rest_api/test_rest_v2_0_0.py
@@ -727,6 +727,10 @@ class TestApi(unittest.TestCase):
start = json.loads(r.text)
self.assertGreater(len(start["Errs"]), 0, r.text)
+ def test_df(self):
+ r = requests.get(_url("/system/df"))
+ self.assertEqual(r.status_code, 200, r.text)
+
if __name__ == "__main__":
unittest.main()