Merge branch 'develop' into align_userdata

2019-08-02 20:08:26 +02:00
parent bcccdda7c0 e8be357624
commit 39e8e507d9
3 changed files with 18 additions and 11 deletions
--- a/freqtrade/tests/optimize/test_hyperopt.py
+++ b/freqtrade/tests/optimize/test_hyperopt.py
@@ -26,6 +26,7 @@ from freqtrade.tests.conftest import (get_args, log_has, log_has_re,

@pytest.fixture(scope='function')
 def hyperopt(default_conf, mocker):
+    default_conf.update({'spaces': ['all']})
    patch_exchange(mocker)
    return Hyperopt(default_conf)

@@ -458,6 +459,7 @@ def test_start_calls_optimizer(mocker, default_conf, caplog, capsys) -> None:

    hyperopt = Hyperopt(default_conf)
    hyperopt.strategy.tickerdata_to_dataframe = MagicMock()
+    hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={})

    hyperopt.start()