From cfae98ae0066d18239678503392bab1ba2d98e5b Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 14 May 2023 11:10:21 +0200 Subject: [PATCH] dt_now for tests --- tests/persistence/test_persistence.py | 13 +++++++------ tests/strategy/test_interface.py | 6 +++--- tests/test_freqtradebot.py | 19 ++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/persistence/test_persistence.py b/tests/persistence/test_persistence.py index 6af629c75..92a0592cb 100644 --- a/tests/persistence/test_persistence.py +++ b/tests/persistence/test_persistence.py @@ -10,6 +10,7 @@ from freqtrade.constants import CUSTOM_TAG_MAX_LENGTH, DATETIME_PRINT_FORMAT from freqtrade.enums import TradingMode from freqtrade.exceptions import DependencyException from freqtrade.persistence import LocalTrade, Order, Trade, init_db +from freqtrade.util.datetime_helpers import dt_now from tests.conftest import create_mock_trades, create_mock_trades_with_leverage, log_has, log_has_re @@ -27,7 +28,7 @@ def test_enter_exit_side(fee, is_short): open_rate=0.01, amount=5, is_open=True, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=fee.return_value, fee_close=fee.return_value, exchange='binance', @@ -49,7 +50,7 @@ def test_set_stop_loss_liquidation(fee): open_rate=2.0, amount=30.0, is_open=True, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=fee.return_value, fee_close=fee.return_value, exchange='binance', @@ -329,7 +330,7 @@ def test_borrowed(fee, is_short, lev, borrowed, trading_mode): open_rate=2.0, amount=30.0, is_open=True, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=fee.return_value, fee_close=fee.return_value, exchange='binance', @@ -428,7 +429,7 @@ def test_update_limit_order(fee, caplog, limit_buy_order_usdt, limit_sell_order_ open_rate=open_rate, amount=30.0, is_open=True, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=fee.return_value, fee_close=fee.return_value, exchange='binance', @@ -485,7 +486,7 @@ def test_update_market_order(market_buy_order_usdt, market_sell_order_usdt, fee, is_open=True, fee_open=fee.return_value, fee_close=fee.return_value, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), exchange='binance', trading_mode=margin, leverage=1.0, @@ -2592,7 +2593,7 @@ def test_recalc_trade_from_orders_dca(data) -> None: open_rate=data['orders'][0][0][2], amount=data['orders'][0][0][1], is_open=True, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=data['fee'], fee_close=data['fee'], exchange='binance', diff --git a/tests/strategy/test_interface.py b/tests/strategy/test_interface.py index ef8fd0be9..a7dde20d6 100644 --- a/tests/strategy/test_interface.py +++ b/tests/strategy/test_interface.py @@ -465,7 +465,7 @@ def test_ft_stoploss_reached(default_conf, fee, profit, adjusted, expected, liq, if custom_stop: strategy.custom_stoploss = custom_stop - now = arrow.utcnow().datetime + now = dt_now() current_rate = trade.open_rate * (1 + profit) sl_flag = strategy.ft_stoploss_reached(current_rate=current_rate, trade=trade, current_time=now, current_profit=profit, @@ -506,7 +506,7 @@ def test_custom_exit(default_conf, fee, caplog) -> None: open_rate=1, ) - now = arrow.utcnow().datetime + now = dt_now() res = strategy.should_exit(trade, 1, now, enter=False, exit_=False, low=None, high=None) @@ -554,7 +554,7 @@ def test_should_sell(default_conf, fee) -> None: exchange='binance', open_rate=1, ) - now = arrow.utcnow().datetime + now = dt_now() res = strategy.should_exit(trade, 1, now, enter=False, exit_=False, low=None, high=None) diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py index 8aa3f63d5..43204fb4d 100644 --- a/tests/test_freqtradebot.py +++ b/tests/test_freqtradebot.py @@ -22,6 +22,7 @@ from freqtrade.freqtradebot import FreqtradeBot from freqtrade.persistence import Order, PairLocks, Trade from freqtrade.persistence.models import PairLock from freqtrade.plugins.protections.iprotection import ProtectionReturn +from freqtrade.util.datetime_helpers import dt_now from freqtrade.worker import Worker from tests.conftest import (EXMS, create_mock_trades, create_mock_trades_usdt, get_patched_freqtradebot, get_patched_worker, log_has, log_has_re, @@ -2013,7 +2014,7 @@ def test_tsl_on_exchange_compatible_with_edge(mocker, edge_conf, fee, limit_orde trade.is_open = True trade.open_order_id = None trade.stoploss_order_id = '100' - trade.stoploss_last_update = arrow.utcnow().datetime + trade.stoploss_last_update = dt_now() trade.orders.append( Order( ft_order_side='stoploss', @@ -2123,7 +2124,7 @@ def test_exit_positions(mocker, default_conf_usdt, limit_order, is_short, caplog fee_open=0.001, fee_close=0.001, open_rate=0.01, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), stake_amount=0.01, amount=11, exchange="binance", @@ -2169,7 +2170,7 @@ def test_exit_positions_exception(mocker, default_conf_usdt, limit_order, caplog fee_open=0.001, fee_close=0.001, open_rate=0.01, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), stake_amount=0.01, amount=11, exchange="binance", @@ -2218,7 +2219,7 @@ def test_update_trade_state(mocker, default_conf_usdt, limit_order, is_short, ca fee_open=0.001, fee_close=0.001, open_rate=0.01, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), amount=11, exchange="binance", is_short=is_short, @@ -2291,7 +2292,7 @@ def test_update_trade_state_withorderdict( amount=amount, exchange='binance', open_rate=2.0, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), fee_open=fee.return_value, fee_close=fee.return_value, open_order_id=order_id, @@ -2378,7 +2379,7 @@ def test_update_trade_state_sell( open_rate=0.245441, fee_open=0.0025, fee_close=0.0025, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), open_order_id=open_order['id'], is_open=True, interest_rate=0.0005, @@ -3420,7 +3421,7 @@ def test_handle_cancel_exit_limit(mocker, default_conf_usdt, fee) -> None: fee_open=fee.return_value, fee_close=fee.return_value, close_rate=0.555, - close_date=arrow.utcnow().datetime, + close_date=dt_now(), exit_reason="sell_reason_whatever", stake_amount=0.245441 * 2, ) @@ -5437,7 +5438,7 @@ def test_reupdate_enter_order_fees(mocker, default_conf_usdt, fee, caplog, is_sh stake_amount=60.0, fee_open=fee.return_value, fee_close=fee.return_value, - open_date=arrow.utcnow().datetime, + open_date=dt_now(), is_open=True, amount=30, open_rate=2.0, @@ -5573,7 +5574,7 @@ def test_handle_onexchange_order(mocker, default_conf_usdt, limit_order, is_shor fee_open=0.001, fee_close=0.001, open_rate=entry_order['price'], - open_date=arrow.utcnow().datetime, + open_date=dt_now(), stake_amount=entry_order['cost'], amount=entry_order['amount'], exchange="binance",