Merge branch 'develop' into time_in_force

freqtrade/tests/exchange/test_exchange.py

@@ -9,6 +9,7 @@ from unittest.mock import Mock, MagicMock, PropertyMock
 import arrow
 import ccxt
 import pytest
+from pandas import DataFrame
 
 from freqtrade import DependencyException, OperationalException, TemporaryError
 from freqtrade.exchange import API_RETRY_COUNT, Exchange
@@ -780,12 +781,20 @@ def test_get_history(default_conf, mocker, caplog):
 def test_refresh_tickers(mocker, default_conf, caplog) -> None:
     tick = [
         [
-            1511686200000,  # unix timestamp ms
+            (arrow.utcnow().timestamp - 1) * 1000,  # unix timestamp ms
             1,  # open
             2,  # high
             3,  # low
             4,  # close
             5,  # volume (in quote currency)
+        ],
+        [
+            arrow.utcnow().timestamp * 1000,  # unix timestamp ms
+            3,  # open
+            1,  # high
+            4,  # low
+            6,  # close
+            5,  # volume (in quote currency)
         ]
     ]
 
@@ -795,13 +804,21 @@ def test_refresh_tickers(mocker, default_conf, caplog) -> None:
 
     pairs = ['IOTA/ETH', 'XRP/ETH']
     # empty dicts
-    assert not exchange.klines
+    assert not exchange._klines
     exchange.refresh_tickers(['IOTA/ETH', 'XRP/ETH'], '5m')
 
     assert log_has(f'Refreshing klines for {len(pairs)} pairs', caplog.record_tuples)
-    assert exchange.klines
+    assert exchange._klines
+    assert exchange._api_async.fetch_ohlcv.call_count == 2
     for pair in pairs:
-        assert exchange.klines[pair]
+        assert isinstance(exchange.klines(pair), DataFrame)
+        assert len(exchange.klines(pair)) > 0
+
+    # test caching
+    exchange.refresh_tickers(['IOTA/ETH', 'XRP/ETH'], '5m')
+
+    assert exchange._api_async.fetch_ohlcv.call_count == 2
+    assert log_has(f"Using cached klines data for {pairs[0]} ...", caplog.record_tuples)
 
 
 @pytest.mark.asyncio
@@ -831,10 +848,6 @@ async def test__async_get_candle_history(default_conf, mocker, caplog):
     assert res[1] == tick
     assert exchange._api_async.fetch_ohlcv.call_count == 1
     assert not log_has(f"Using cached klines data for {pair} ...", caplog.record_tuples)
-    # test caching
-    res = await exchange._async_get_candle_history(pair, "5m")
-    assert exchange._api_async.fetch_ohlcv.call_count == 1
-    assert log_has(f"Using cached klines data for {pair} ...", caplog.record_tuples)
 
     # exchange = Exchange(default_conf)
     await async_ccxt_exception(mocker, default_conf, MagicMock(),

freqtrade/tests/exchange/test_exchange_helpers.py

@@ -1,6 +1,8 @@
 # pragma pylint: disable=missing-docstring, C0103
+import logging
 
 from freqtrade.exchange.exchange_helpers import parse_ticker_dataframe
+from freqtrade.tests.conftest import log_has
 
 
 def test_dataframe_correct_length(result):
@@ -13,9 +15,11 @@ def test_dataframe_correct_columns(result):
         ['date', 'open', 'high', 'low', 'close', 'volume']
 
 
-def test_parse_ticker_dataframe(ticker_history):
+def test_parse_ticker_dataframe(ticker_history, caplog):
     columns = ['date', 'open', 'high', 'low', 'close', 'volume']
 
+    caplog.set_level(logging.DEBUG)
     # Test file with BV data
     dataframe = parse_ticker_dataframe(ticker_history)
     assert dataframe.columns.tolist() == columns
+    assert log_has('Parsing tickerlist to dataframe', caplog.record_tuples)