Merge pull request ceph#24350 from ricardoasmarques/wip-json-decode

mgr/dashboard: Check content-type before decode json response Reviewed-by: Lenz Grimmer <[email protected]> Reviewed-by: Ricardo Dias <[email protected]>
bbc · Oct 4, 2018 · 43a72f0 · 43a72f0
2 parents 25ee677 + 731dcef
commit 43a72f0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py
@@ -169,7 +169,8 @@ def _request(cls, url, method, data=None, params=None):
         else:
             assert False
         try:
-            if cls._resp.text and cls._resp.text != "":
+            content_type = cls._resp.headers['content-type']
+            if content_type == 'application/json' and cls._resp.text and cls._resp.text != "":
                 return cls._resp.json()
             return cls._resp.text
         except ValueError as ex: