diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index 0d8fbd8d9..6a4d7cbd4 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -279,7 +279,7 @@ def limit_sell_order(): @pytest.fixture -def ticker_history_api(): +def ticker_history(): return [ [ 1511686200000, # unix timestamp ms @@ -308,69 +308,6 @@ def ticker_history_api(): ] -@pytest.fixture -def ticker_history(): - return [ - { - "O": 8.794e-05, - "H": 8.948e-05, - "L": 8.794e-05, - "C": 8.88e-05, - "V": 991.09056638, - "T": "2017-11-26T08:50:00", - "BV": 0.0877869 - }, - { - "O": 8.88e-05, - "H": 8.942e-05, - "L": 8.88e-05, - "C": 8.893e-05, - "V": 658.77935965, - "T": "2017-11-26T08:55:00", - "BV": 0.05874751 - }, - { - "O": 8.891e-05, - "H": 8.893e-05, - "L": 8.875e-05, - "C": 8.877e-05, - "V": 7920.73570705, - "T": "2017-11-26T09:00:00", - "BV": 0.7039405 - } - ] - - -@pytest.fixture -def ticker_history_without_bv(): - return [ - { - "O": 8.794e-05, - "H": 8.948e-05, - "L": 8.794e-05, - "C": 8.88e-05, - "V": 991.09056638, - "T": "2017-11-26T08:50:00" - }, - { - "O": 8.88e-05, - "H": 8.942e-05, - "L": 8.88e-05, - "C": 8.893e-05, - "V": 658.77935965, - "T": "2017-11-26T08:55:00" - }, - { - "O": 8.891e-05, - "H": 8.893e-05, - "L": 8.875e-05, - "C": 8.877e-05, - "V": 7920.73570705, - "T": "2017-11-26T09:00:00" - } - ] - - @pytest.fixture def tickers(): return MagicMock(return_value={ diff --git a/freqtrade/tests/test_analyze.py b/freqtrade/tests/test_analyze.py index 7a3ccc129..8d521150d 100644 --- a/freqtrade/tests/test_analyze.py +++ b/freqtrade/tests/test_analyze.py @@ -169,17 +169,13 @@ def test_get_signal_handles_exceptions(mocker): assert _ANALYZE.get_signal('ETH/BTC', '5m') == (False, False) -def test_parse_ticker_dataframe(ticker_history, ticker_history_without_bv): +def test_parse_ticker_dataframe(ticker_history): columns = ['date', 'open', 'high', 'low', 'close', 'volume'] # Test file with BV data dataframe = Analyze.parse_ticker_dataframe(ticker_history) assert dataframe.columns.tolist() == columns - # Test file without BV data - dataframe = Analyze.parse_ticker_dataframe(ticker_history_without_bv) - assert dataframe.columns.tolist() == columns - def test_tickerdata_to_dataframe(default_conf) -> None: """