ruff format: Update more test files

This commit is contained in:
Matthias
2024-05-12 15:59:04 +02:00
parent ca1fe06035
commit d8a8b5c125
8 changed files with 340 additions and 313 deletions

View File

@@ -15,14 +15,13 @@ from tests.conftest import EXMS, get_args, log_has_re, patch_exchange
@pytest.fixture
def recursive_conf(default_conf_usdt, tmp_path):
default_conf_usdt['user_data_dir'] = tmp_path
default_conf_usdt['timerange'] = '20220101-20220501'
default_conf_usdt["user_data_dir"] = tmp_path
default_conf_usdt["timerange"] = "20220101-20220501"
default_conf_usdt['strategy_path'] = str(
Path(__file__).parent.parent / "strategy/strats")
default_conf_usdt['strategy'] = 'strategy_test_v3_recursive_issue'
default_conf_usdt['pairs'] = ['UNITTEST/USDT']
default_conf_usdt['startup_candle'] = [100]
default_conf_usdt["strategy_path"] = str(Path(__file__).parent.parent / "strategy/strats")
default_conf_usdt["strategy"] = "strategy_test_v3_recursive_issue"
default_conf_usdt["pairs"] = ["UNITTEST/USDT"]
default_conf_usdt["startup_candle"] = [100]
return default_conf_usdt
@@ -30,7 +29,7 @@ def test_start_recursive_analysis(mocker):
single_mock = MagicMock()
text_table_mock = MagicMock()
mocker.patch.multiple(
'freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions',
"freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions",
initialize_single_recursive_analysis=single_mock,
text_table_recursive_analysis_instances=text_table_mock,
)
@@ -43,10 +42,10 @@ def test_start_recursive_analysis(mocker):
"--pairs",
"UNITTEST/BTC",
"--timerange",
"20220101-20220201"
"20220101-20220201",
]
pargs = get_args(args)
pargs['config'] = None
pargs["config"] = None
start_recursive_analysis(pargs)
assert single_mock.call_count == 1
@@ -62,21 +61,19 @@ def test_start_recursive_analysis(mocker):
"--strategy-path",
str(Path(__file__).parent.parent / "strategy/strats"),
"--pairs",
"UNITTEST/BTC"
"UNITTEST/BTC",
]
pargs = get_args(args)
pargs['config'] = None
with pytest.raises(OperationalException,
match=r"Please set a timerange\..*"):
pargs["config"] = None
with pytest.raises(OperationalException, match=r"Please set a timerange\..*"):
start_recursive_analysis(pargs)
def test_recursive_helper_no_strategy_defined(recursive_conf):
conf = deepcopy(recursive_conf)
conf['pairs'] = ['UNITTEST/USDT']
del conf['strategy']
with pytest.raises(OperationalException,
match=r"No Strategy specified"):
conf["pairs"] = ["UNITTEST/USDT"]
del conf["strategy"]
with pytest.raises(OperationalException, match=r"No Strategy specified"):
RecursiveAnalysisSubFunctions.start(conf)
@@ -84,7 +81,7 @@ def test_recursive_helper_start(recursive_conf, mocker) -> None:
single_mock = MagicMock()
text_table_mock = MagicMock()
mocker.patch.multiple(
'freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions',
"freqtrade.optimize.analysis.recursive_helpers.RecursiveAnalysisSubFunctions",
initialize_single_recursive_analysis=single_mock,
text_table_recursive_analysis_instances=text_table_mock,
)
@@ -98,82 +95,83 @@ def test_recursive_helper_start(recursive_conf, mocker) -> None:
def test_recursive_helper_text_table_recursive_analysis_instances(recursive_conf):
dict_diff = dict()
dict_diff['rsi'] = {}
dict_diff['rsi'][100] = "0.078%"
dict_diff["rsi"] = {}
dict_diff["rsi"][100] = "0.078%"
strategy_obj = {
'name': "strategy_test_v3_recursive_issue",
'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
"name": "strategy_test_v3_recursive_issue",
"location": Path(recursive_conf["strategy_path"], f"{recursive_conf['strategy']}.py"),
}
instance = RecursiveAnalysis(recursive_conf, strategy_obj)
instance.dict_recursive = dict_diff
_table, _headers, data = (RecursiveAnalysisSubFunctions.
text_table_recursive_analysis_instances([instance]))
_table, _headers, data = RecursiveAnalysisSubFunctions.text_table_recursive_analysis_instances(
[instance]
)
# check row contents for a try that has too few signals
assert data[0][0] == 'rsi'
assert data[0][1] == '0.078%'
assert data[0][0] == "rsi"
assert data[0][1] == "0.078%"
assert len(data[0]) == 2
# now check when there is no issue
dict_diff = dict()
instance = RecursiveAnalysis(recursive_conf, strategy_obj)
instance.dict_recursive = dict_diff
_table, _headers, data = (RecursiveAnalysisSubFunctions.
text_table_recursive_analysis_instances([instance]))
_table, _headers, data = RecursiveAnalysisSubFunctions.text_table_recursive_analysis_instances(
[instance]
)
assert len(data) == 0
def test_initialize_single_recursive_analysis(recursive_conf, mocker, caplog):
mocker.patch('freqtrade.data.history.get_timerange', get_timerange)
mocker.patch("freqtrade.data.history.get_timerange", get_timerange)
patch_exchange(mocker)
mocker.patch('freqtrade.plugins.pairlistmanager.PairListManager.whitelist',
PropertyMock(return_value=['UNITTEST/BTC']))
recursive_conf['pairs'] = ['UNITTEST/BTC']
mocker.patch(
"freqtrade.plugins.pairlistmanager.PairListManager.whitelist",
PropertyMock(return_value=["UNITTEST/BTC"]),
)
recursive_conf["pairs"] = ["UNITTEST/BTC"]
recursive_conf['timeframe'] = '5m'
recursive_conf['timerange'] = '20180119-20180122'
start_mock = mocker.patch('freqtrade.optimize.analysis.recursive.RecursiveAnalysis.start')
recursive_conf["timeframe"] = "5m"
recursive_conf["timerange"] = "20180119-20180122"
start_mock = mocker.patch("freqtrade.optimize.analysis.recursive.RecursiveAnalysis.start")
strategy_obj = {
'name': "strategy_test_v3_recursive_issue",
'location': Path(recursive_conf['strategy_path'], f"{recursive_conf['strategy']}.py")
"name": "strategy_test_v3_recursive_issue",
"location": Path(recursive_conf["strategy_path"], f"{recursive_conf['strategy']}.py"),
}
instance = RecursiveAnalysisSubFunctions.initialize_single_recursive_analysis(
recursive_conf, strategy_obj)
recursive_conf, strategy_obj
)
assert log_has_re(r"Recursive test of .* started\.", caplog)
assert start_mock.call_count == 1
assert instance.strategy_obj['name'] == "strategy_test_v3_recursive_issue"
assert instance.strategy_obj["name"] == "strategy_test_v3_recursive_issue"
@pytest.mark.parametrize('scenario', [
'no_bias', 'bias1', 'bias2'
])
@pytest.mark.parametrize("scenario", ["no_bias", "bias1", "bias2"])
def test_recursive_biased_strategy(recursive_conf, mocker, caplog, scenario) -> None:
patch_exchange(mocker)
mocker.patch(f'{EXMS}.get_fee', return_value=0.0)
mocker.patch('freqtrade.data.history.get_timerange', get_timerange)
mocker.patch('freqtrade.plugins.pairlistmanager.PairListManager.whitelist',
PropertyMock(return_value=['UNITTEST/BTC']))
recursive_conf['pairs'] = ['UNITTEST/BTC']
mocker.patch(f"{EXMS}.get_fee", return_value=0.0)
mocker.patch("freqtrade.data.history.get_timerange", get_timerange)
mocker.patch(
"freqtrade.plugins.pairlistmanager.PairListManager.whitelist",
PropertyMock(return_value=["UNITTEST/BTC"]),
)
recursive_conf["pairs"] = ["UNITTEST/BTC"]
recursive_conf['timeframe'] = '5m'
recursive_conf['timerange'] = '20180119-20180122'
recursive_conf['startup_candle'] = [100]
recursive_conf["timeframe"] = "5m"
recursive_conf["timerange"] = "20180119-20180122"
recursive_conf["startup_candle"] = [100]
# Patch scenario Parameter to allow for easy selection
mocker.patch('freqtrade.strategy.hyper.HyperStrategyMixin.load_params_from_file',
return_value={
'params': {
"buy": {
"scenario": scenario
}
}
})
mocker.patch(
"freqtrade.strategy.hyper.HyperStrategyMixin.load_params_from_file",
return_value={"params": {"buy": {"scenario": scenario}}},
)
strategy_obj = {'name': "strategy_test_v3_recursive_issue"}
strategy_obj = {"name": "strategy_test_v3_recursive_issue"}
instance = RecursiveAnalysis(recursive_conf, strategy_obj)
instance.start()
# Assert init correct
@@ -181,7 +179,7 @@ def test_recursive_biased_strategy(recursive_conf, mocker, caplog, scenario) ->
if scenario == "bias2":
assert log_has_re("=> found lookahead in indicator rsi", caplog)
diff_pct = abs(float(instance.dict_recursive['rsi'][100].replace("%", "")))
diff_pct = abs(float(instance.dict_recursive["rsi"][100].replace("%", "")))
# check non-biased strategy
if scenario == "no_bias":
assert diff_pct < 0.01