From 6cc0dc44ecfa6fe328772a3ad946f759ee6d6491 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 7 Apr 2021 13:55:03 -0700 Subject: 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 --- pkg/api/handlers/libpod/system.go | 1 + test/apiv2/rest_api/test_rest_v2_0_0.py | 4 ++++ 2 files changed, 5 insertions(+) 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() -- cgit v1.2.3-54-g00ecf