diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-04-07 13:55:03 -0700 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 11:46:49 -0400 |
| commit | 7ccccd22cd8413e3319c24be6b074385d760d341 (patch) | |
| tree | 871f741aa58ef99a3901aaa7fd5a046385b75c47 | |
| parent | 0406fbb2bbeff1d11b1979381997b656e686df94 (diff) | |
| download | podman-7ccccd22cd8413e3319c24be6b074385d760d341.tar.gz podman-7ccccd22cd8413e3319c24be6b074385d760d341.tar.bz2 podman-7ccccd22cd8413e3319c24be6b074385d760d341.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.go | 1 | ||||
| -rw-r--r-- | test/apiv2/rest_api/test_rest_v2_0_0.py | 4 |
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 9924bd65e..75e07ad3c 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__": |