CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 00:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test_trade_custom_data and test_backtest_results

Browse Source
This commit is contained in:
Axel-CH
2024-09-20 18:44:58 -04:00
parent 6b8ca7217b
commit 0d3ab37eb7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/optimize/backtesting.py
View File

@@ -1377,7 +1377,8 @@ class Backtesting:
self.wallets.update() self.wallets.update()
# 4. Create exit orders (if any) # 4. Create exit orders (if any)
self._check_trade_exit(trade, row, current_time) # Place exit order if necessary if trade.has_open_position:
self._check_trade_exit(trade, row, current_time) # Place exit order if necessary
# 5. Process exit orders. # 5. Process exit orders.
order = trade.select_order(trade.exit_side, is_open=True) order = trade.select_order(trade.exit_side, is_open=True)

7
tests/persistence/test_trade_custom_data.py
View File

@@ -60,6 +60,7 @@ def test_trade_custom_data(fee, use_db):
def test_trade_custom_data_strategy_compat(mocker, default_conf_usdt, fee): def test_trade_custom_data_strategy_compat(mocker, default_conf_usdt, fee):
mocker.patch(f"{EXMS}.get_rate", return_value=0.50) mocker.patch(f"{EXMS}.get_rate", return_value=0.50)
mocker.patch("freqtrade.freqtradebot.FreqtradeBot.get_real_amount", return_value=None) mocker.patch("freqtrade.freqtradebot.FreqtradeBot.get_real_amount", return_value=None)
mocker.patch("freqtrade.freqtradebot.FreqtradeBot.handle_cancel_exit", return_value=True)
default_conf_usdt["minimal_roi"] = {"0": 100} default_conf_usdt["minimal_roi"] = {"0": 100}
freqtrade = get_patched_freqtradebot(mocker, default_conf_usdt) freqtrade = get_patched_freqtradebot(mocker, default_conf_usdt)
@@ -85,8 +86,10 @@ def test_trade_custom_data_strategy_compat(mocker, default_conf_usdt, fee):
trade_after = Trade.get_trades_proxy(pair="ADA/USDT")[0] trade_after = Trade.get_trades_proxy(pair="ADA/USDT")[0]
assert trade_after.get_custom_data("test_str") == "test_value" assert trade_after.get_custom_data("test_str") == "test_value"
assert trade_after.get_custom_data("test_int") == 1 assert trade_after.get_custom_data("test_int") == 1
# 2 open pairs eligible for exit # 2 trades filled entry, with open exit order
assert ff_spy.call_count == 2 # 1 trade with unfilled open entry order
# 1 trade with filled entry order
assert ff_spy.call_count == 4
assert trade_after.exit_reason == "test_value_1" assert trade_after.exit_reason == "test_value_1"