Adjust tests for new naming

This commit is contained in:
Matthias
2023-10-01 08:00:09 +02:00
parent 19af144b33
commit 4809c9f07a
2 changed files with 10 additions and 12 deletions
+5 -6
View File
@@ -8,8 +8,8 @@ import pytest
from freqtrade.commands.optimize_commands import start_lookahead_analysis from freqtrade.commands.optimize_commands import start_lookahead_analysis
from freqtrade.data.history import get_timerange from freqtrade.data.history import get_timerange
from freqtrade.exceptions import OperationalException from freqtrade.exceptions import OperationalException
from freqtrade.optimize.analysis.lookahead_analysis import Analysis, LookaheadAnalysis from freqtrade.optimize.analysis.lookahead import Analysis, LookaheadAnalysis
from freqtrade.optimize.analysis.lookahead_analysis_helpers import LookaheadAnalysisSubFunctions from freqtrade.optimize.analysis.lookahead_helpers import LookaheadAnalysisSubFunctions
from tests.conftest import EXMS, get_args, log_has_re, patch_exchange from tests.conftest import EXMS, get_args, log_has_re, patch_exchange
@@ -32,7 +32,7 @@ def test_start_lookahead_analysis(mocker):
single_mock = MagicMock() single_mock = MagicMock()
text_table_mock = MagicMock() text_table_mock = MagicMock()
mocker.patch.multiple( mocker.patch.multiple(
'freqtrade.optimize.analysis.lookahead_analysis_helpers.LookaheadAnalysisSubFunctions', 'freqtrade.optimize.analysis.lookahead_helpers.LookaheadAnalysisSubFunctions',
initialize_single_lookahead_analysis=single_mock, initialize_single_lookahead_analysis=single_mock,
text_table_lookahead_analysis_instances=text_table_mock, text_table_lookahead_analysis_instances=text_table_mock,
) )
@@ -117,7 +117,7 @@ def test_lookahead_helper_start(lookahead_conf, mocker) -> None:
single_mock = MagicMock() single_mock = MagicMock()
text_table_mock = MagicMock() text_table_mock = MagicMock()
mocker.patch.multiple( mocker.patch.multiple(
'freqtrade.optimize.analysis.lookahead_analysis_helpers.LookaheadAnalysisSubFunctions', 'freqtrade.optimize.analysis.lookahead_helpers.LookaheadAnalysisSubFunctions',
initialize_single_lookahead_analysis=single_mock, initialize_single_lookahead_analysis=single_mock,
text_table_lookahead_analysis_instances=text_table_mock, text_table_lookahead_analysis_instances=text_table_mock,
) )
@@ -324,8 +324,7 @@ def test_initialize_single_lookahead_analysis(lookahead_conf, mocker, caplog):
lookahead_conf['timeframe'] = '5m' lookahead_conf['timeframe'] = '5m'
lookahead_conf['timerange'] = '20180119-20180122' lookahead_conf['timerange'] = '20180119-20180122'
start_mock = mocker.patch( start_mock = mocker.patch('freqtrade.optimize.analysis.lookahead.LookaheadAnalysis.start')
'freqtrade.optimize.analysis.lookahead_analysis.LookaheadAnalysis.start')
strategy_obj = { strategy_obj = {
'name': "strategy_test_v3_with_lookahead_bias", 'name': "strategy_test_v3_with_lookahead_bias",
'location': Path(lookahead_conf['strategy_path'], f"{lookahead_conf['strategy']}.py") 'location': Path(lookahead_conf['strategy_path'], f"{lookahead_conf['strategy']}.py")
+5 -6
View File
@@ -8,8 +8,8 @@ import pytest
from freqtrade.commands.optimize_commands import start_recursive_analysis from freqtrade.commands.optimize_commands import start_recursive_analysis
from freqtrade.data.history import get_timerange from freqtrade.data.history import get_timerange
from freqtrade.exceptions import OperationalException from freqtrade.exceptions import OperationalException
from freqtrade.optimize.analysis.recursive_analysis import RecursiveAnalysis from freqtrade.optimize.analysis.recursive import RecursiveAnalysis
from freqtrade.optimize.analysis.recursive_analysis_helpers import RecursiveAnalysisSubFunctions from freqtrade.optimize.analysis.recursive_helpers import RecursiveAnalysisSubFunctions
from tests.conftest import get_args, log_has_re, patch_exchange from tests.conftest import get_args, log_has_re, patch_exchange
@@ -29,7 +29,7 @@ def test_start_recursive_analysis(mocker):
single_mock = MagicMock() single_mock = MagicMock()
text_table_mock = MagicMock() text_table_mock = MagicMock()
mocker.patch.multiple( mocker.patch.multiple(
'freqtrade.optimize.analysis.recursive_analysis_helpers.RecursiveAnalysisSubFunctions', 'freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions',
initialize_single_recursive_analysis=single_mock, initialize_single_recursive_analysis=single_mock,
text_table_recursive_analysis_instances=text_table_mock, text_table_recursive_analysis_instances=text_table_mock,
) )
@@ -83,7 +83,7 @@ def test_recursive_helper_start(recursive_conf, mocker) -> None:
single_mock = MagicMock() single_mock = MagicMock()
text_table_mock = MagicMock() text_table_mock = MagicMock()
mocker.patch.multiple( mocker.patch.multiple(
'freqtrade.optimize.analysis.recursive_analysis_helpers.RecursiveAnalysisSubFunctions', 'freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions',
initialize_single_recursive_analysis=single_mock, initialize_single_recursive_analysis=single_mock,
text_table_recursive_analysis_instances=text_table_mock, text_table_recursive_analysis_instances=text_table_mock,
) )
@@ -133,8 +133,7 @@ def test_initialize_single_recursive_analysis(recursive_conf, mocker, caplog):
recursive_conf['timeframe'] = '5m' recursive_conf['timeframe'] = '5m'
recursive_conf['timerange'] = '20180119-20180122' recursive_conf['timerange'] = '20180119-20180122'
start_mock = mocker.patch( start_mock = mocker.patch('freqtrade.optimize.analysis.recursive.RecursiveAnalysis.start')
'freqtrade.optimize.analysis.recursive_analysis.RecursiveAnalysis.start')
strategy_obj = { strategy_obj = {
'name': "strategy_test_v3_recursive_issue", 'name': "strategy_test_v3_recursive_issue",
'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py") 'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")