Add tests to check response exceptions

Sam McHardy · Sam McHardy · commit 4ad00b8aafba · 2017-10-30T19:26:57.000+09:30
diff --git a/binance/client.py b/binance/client.py
@@ -6,7 +6,7 @@
 import requests
 import six
 import time
-from .exceptions import BinanceAPIException, BinanceWithdrawException
+from .exceptions import BinanceAPIException, BinanceRequestException, BinanceWithdrawException
 from .validation import validate_order
 from .enums import TIME_IN_FORCE_GTC, SIDE_BUY, SIDE_SELL, ORDER_TYPE_LIMIT, ORDER_TYPE_MARKET
 
@@ -129,7 +129,10 @@ def _handle_response(self, response):
         """
         if not str(response.status_code).startswith('2'):
             raise BinanceAPIException(response)
-        return response.json()
+        try:
+            return response.json()
+        except ValueError:
+            raise BinanceRequestException('Invalid Response: %s' % response.text)
 
     def _get(self, path, signed=False, **kwargs):
         return self._request_api('get', path, signed, **kwargs)
diff --git a/binance/exceptions.py b/binance/exceptions.py
@@ -15,6 +15,14 @@ def __str__(self):  # pragma: no cover
         return 'APIError(code=%s): %s' % (self.code, self.message)
 
 
+class BinanceRequestException(Exception):
+    def __init__(self, message):
+        self.message = message
+
+    def __str__(self):
+        return 'BinanceRequestException: %s' % self.message
+
+
 class BinanceOrderException(Exception):
 
     def __init__(self, code, message):
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -4,5 +4,6 @@ pytest==3.2.1
 pytest-cov==2.5.1
 pytest-pep8==1.0.6
 python-coveralls==2.9.1
+requests-mock==1.3.0
 tox==2.7.0
 setuptools==36.6.0
diff --git a/tests/test_api_request.py b/tests/test_api_request.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# coding=utf-8
+
+from binance.client import Client
+from binance.exceptions import BinanceAPIException, BinanceRequestException
+import pytest
+import requests_mock
+
+
+client = Client('api_key', 'api_secret')
+
+
+def test_invalid_json():
+    """Test Invalid response Exception"""
+
+    with pytest.raises(BinanceRequestException):
+        with requests_mock.mock() as m:
+            m.get('https://www.binance.com/exchange/public/product', text='<head></html>')
+            client.get_products()
+
+
+def test_api_exception():
+    """Test API response Exception"""
+
+    with pytest.raises(BinanceAPIException):
+        with requests_mock.mock() as m:
+            json_obj = {"code": 1002, "msg": "Invalid API call"}
+            m.get('https://www.binance.com/api/v1/time', json=json_obj, status_code=400)
+            client.get_server_time()
