From 60e2ce0379e75eb2f7d31ed804c2e49a09dcb8a8 Mon Sep 17 00:00:00 2001 From: AuroraTradingTeam Date: Sat, 11 Nov 2017 15:11:14 +0000 Subject: [PATCH] Resolved unit test issue --- libcryptomarket/__init__.py | 3 --- libcryptomarket/api/__init__.py | 0 libcryptomarket/api/cryptocompare_api.py | 9 +++++++-- libcryptomarket/price.py | 0 tests/test_cryptocompare_api.py | 8 ++++++++ 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 libcryptomarket/api/__init__.py create mode 100644 libcryptomarket/price.py diff --git a/libcryptomarket/__init__.py b/libcryptomarket/__init__.py index 5facc07..6d5350e 100644 --- a/libcryptomarket/__init__.py +++ b/libcryptomarket/__init__.py @@ -5,6 +5,3 @@ __author__ = """Gavin Chan""" __email__ = 'gavincyi@gmail.com' __version__ = '0.1.0' -__all__ = ['api'] - -from . import api diff --git a/libcryptomarket/api/__init__.py b/libcryptomarket/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/libcryptomarket/api/cryptocompare_api.py b/libcryptomarket/api/cryptocompare_api.py index ff7faad..bcbf93a 100644 --- a/libcryptomarket/api/cryptocompare_api.py +++ b/libcryptomarket/api/cryptocompare_api.py @@ -56,7 +56,9 @@ def get_coinlist(): """ url = API_URL + "all/coinlist" - return requests.get(url).json() + r = requests.get(url) + r.raise_for_status() + return r.json() def get_histo(period, fsym, tsym, e, limit=None, toTs=None): @@ -94,6 +96,9 @@ def get_histo(period, fsym, tsym, e, limit=None, toTs=None): # The api raises a 200 for a warning, but passes a message rjson = r.json() if rjson.get("Message", None): - logger.warning('api returned message %r, for url %r', rjson["Message"], r.url) + logger.warning( + 'api returned message %r, for url %r', + rjson["Message"], + r.url) return rjson diff --git a/libcryptomarket/price.py b/libcryptomarket/price.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_cryptocompare_api.py b/tests/test_cryptocompare_api.py index fb7a0eb..87fdda4 100644 --- a/tests/test_cryptocompare_api.py +++ b/tests/test_cryptocompare_api.py @@ -54,6 +54,10 @@ def test_get_instruments_cryptocompare(monkeypatch): } } + @classmethod + def raise_for_status(cls): + pass + return MockReturnClass() monkeypatch.setattr(requests, 'get', mockreturn) @@ -129,6 +133,10 @@ def test_get_historical_prices_cryptocompare(monkeypatch): }] } + @classmethod + def raise_for_status(cls): + pass + return MockReturnClass() monkeypatch.setattr(requests, 'get', mockreturn)