From 92d7f279833f2925587fd96665295be6ad03b447 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 29 Sep 2023 07:09:48 +0200 Subject: [PATCH] Further update test a bit --- tests/optimize/test_recursive_analysis.py | 15 +++++++-------- .../strats/strategy_test_v3_recursive_issue.py | 8 +++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/optimize/test_recursive_analysis.py b/tests/optimize/test_recursive_analysis.py index 0492ed5e0..f025f5b76 100644 --- a/tests/optimize/test_recursive_analysis.py +++ b/tests/optimize/test_recursive_analysis.py @@ -179,11 +179,10 @@ def test_recursive_biased_strategy(recursive_conf, mocker, caplog, scenario) -> if scenario == "bias2": assert log_has_re("=> found lookahead in indicator rsi", caplog) - else: - diff_pct = abs(float(instance.dict_recursive['rsi'][100].replace("%", ""))) - # check non-biased strategy - if scenario == "no_bias": - assert diff_pct < 0.01 - # check biased strategy - elif scenario == "bias1": - assert diff_pct >= 0.01 + diff_pct = abs(float(instance.dict_recursive['rsi'][100].replace("%", ""))) + # check non-biased strategy + if scenario == "no_bias": + assert diff_pct < 0.01 + # check biased strategy + elif scenario in ("bias1", "bias2"): + assert diff_pct >= 0.01 diff --git a/tests/strategy/strats/strategy_test_v3_recursive_issue.py b/tests/strategy/strats/strategy_test_v3_recursive_issue.py index 974c2c1c2..b3074113d 100644 --- a/tests/strategy/strats/strategy_test_v3_recursive_issue.py +++ b/tests/strategy/strats/strategy_test_v3_recursive_issue.py @@ -28,10 +28,12 @@ class strategy_test_v3_recursive_issue(IStrategy): # bias is introduced here if self.scenario.value == 'no_bias': dataframe['rsi'] = ta.RSI(dataframe, timeperiod=14) - elif self.scenario.value == 'bias1': - dataframe['rsi'] = ta.RSI(dataframe, timeperiod=50) else: - dataframe['rsi'] = ta.RSI(dataframe, timeperiod=50).shift(-1) + dataframe['rsi'] = ta.RSI(dataframe, timeperiod=50) + + if self.scenario.value == 'bias2': + # Has both bias1 and bias2 + dataframe['rsi_lookahead'] = ta.RSI(dataframe, timeperiod=50).shift(-1) return dataframe