From 94caf82ab2666926762ab3564fa683eb33f2a9e4 Mon Sep 17 00:00:00 2001 From: Matthias <5024695+xmatthias@users.noreply.github.com> Date: Thu, 15 Mar 2018 23:37:34 +0100 Subject: [PATCH] Fix test_dataframe when ran standalone (#546) * Fix dataframe test when ran standalone * Fix standalone tests in hyperopt and optimize tests --- freqtrade/tests/optimize/test_hyperopt.py | 8 ++++++-- freqtrade/tests/test_dataframe.py | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/freqtrade/tests/optimize/test_hyperopt.py b/freqtrade/tests/optimize/test_hyperopt.py index 0d13646f2..047c42972 100644 --- a/freqtrade/tests/optimize/test_hyperopt.py +++ b/freqtrade/tests/optimize/test_hyperopt.py @@ -4,8 +4,10 @@ import os from copy import deepcopy from unittest.mock import MagicMock import pandas as pd + from freqtrade.optimize.__init__ import load_tickerdata_file from freqtrade.optimize.hyperopt import Hyperopt, start +from freqtrade.strategy.strategy import Strategy from freqtrade.tests.conftest import default_conf, log_has from freqtrade.tests.optimize.test_backtesting import get_args @@ -59,6 +61,7 @@ def test_start(mocker, default_conf, caplog) -> None: '--epochs', '5' ] args = get_args(args) + Strategy({'strategy': 'default_strategy'}) start(args) import pprint @@ -169,7 +172,7 @@ def test_fmin_best_results(mocker, default_conf, caplog) -> None: hyperopt = Hyperopt(conf) hyperopt.trials = create_trials(mocker) hyperopt.tickerdata_to_dataframe = MagicMock() - + Strategy({'strategy': 'default_strategy'}) hyperopt.start() exists = [ @@ -210,7 +213,7 @@ def test_fmin_throw_value_error(mocker, default_conf, caplog) -> None: conf.update({'spaces': 'all'}) mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', return_value=conf) mocker.patch('freqtrade.logger.Logger.set_format', MagicMock()) - + Strategy({'strategy': 'default_strategy'}) hyperopt = Hyperopt(conf) hyperopt.trials = create_trials(mocker) hyperopt.tickerdata_to_dataframe = MagicMock() @@ -253,6 +256,7 @@ def test_resuming_previous_hyperopt_results_succeeds(mocker, default_conf) -> No mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', return_value=conf) mocker.patch('freqtrade.logger.Logger.set_format', MagicMock()) + Strategy({'strategy': 'default_strategy'}) hyperopt = Hyperopt(conf) hyperopt.trials = trials hyperopt.tickerdata_to_dataframe = MagicMock() diff --git a/freqtrade/tests/test_dataframe.py b/freqtrade/tests/test_dataframe.py index eaa761bdb..86944e4f3 100644 --- a/freqtrade/tests/test_dataframe.py +++ b/freqtrade/tests/test_dataframe.py @@ -1,8 +1,10 @@ # pragma pylint: disable=missing-docstring, C0103 import pandas + from freqtrade.optimize import load_data from freqtrade.analyze import Analyze +from freqtrade.strategy.strategy import Strategy _pairs = ['BTC_ETH'] @@ -19,11 +21,13 @@ def load_dataframe_pair(pairs): def test_dataframe_load(): + Strategy({'strategy': 'default_strategy'}) dataframe = load_dataframe_pair(_pairs) assert isinstance(dataframe, pandas.core.frame.DataFrame) def test_dataframe_columns_exists(): + Strategy({'strategy': 'default_strategy'}) dataframe = load_dataframe_pair(_pairs) assert 'high' in dataframe.columns assert 'low' in dataframe.columns