add json decode error test

Author: lihsai0

qiniu/http.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import json
 import logging
 import platform
 
@@ -26,7 +25,7 @@ def __return_wrapper(resp):
         return None, ResponseInfo(resp)
     resp.encoding = 'utf-8'
     try:
-        ret = json.loads(resp.text)
+        ret = resp.json()
     except ValueError:
         logging.debug("response body decode error: %s" % resp.text)
         ret = {}

test_qiniu.py

@@ -21,6 +21,8 @@
 
 from qiniu.services.storage.uploader import _form_put
 
+from qiniu.http import __return_wrapper as return_wrapper
+
 import qiniu.config
 
 if is_py2:
@@ -75,6 +77,23 @@ def is_travis():
     return os.environ['QINIU_TEST_ENV'] == 'travis'
 
 
+class HttpTest(unittest.TestCase):
+    def test_json_decode_error(self):
+        def mock_res():
+            r = requests.Response()
+            r.status_code = 200
+            r.headers.__setitem__('X-Reqid', 'mockedReqid')
+
+            def json_func():
+                raise ValueError('%s: line %d column %d (char %d)' % ('Expecting value', 0, 0, 0))
+            r.json = json_func
+
+            return r
+        mocked_res = mock_res()
+        ret, _ = return_wrapper(mocked_res)
+        assert ret == {}
+
+
 class UtilsTest(unittest.TestCase):
     def test_urlsafe(self):
         a = 'hello\x96'