From 19526f1df2b613f8eac1b8d4ebaba576c9311d77 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 2 Dec 2025 19:10:45 +0100 Subject: [PATCH] test: update tests to align to improved formatting --- tests/freqtradebot/test_freqtradebot.py | 26 ++++++++++++------------- tests/persistence/test_persistence.py | 20 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/freqtradebot/test_freqtradebot.py b/tests/freqtradebot/test_freqtradebot.py index e36d70c12..f8b790c44 100644 --- a/tests/freqtradebot/test_freqtradebot.py +++ b/tests/freqtradebot/test_freqtradebot.py @@ -2548,9 +2548,9 @@ def test_manage_open_orders_exception( caplog.clear() freqtrade.manage_open_orders() assert log_has_re( - r"Cannot query order for Trade\(id=1, pair=ADA/USDT, amount=30.00000000, " - r"is_short=False, leverage=1.0, " - r"open_rate=2.00000000, open_since=" + r"Cannot query order for Trade\(id=1, pair=ADA/USDT, amount=30, " + r"is_short=False, leverage=1, " + r"open_rate=2, open_since=" f"{open_trade_usdt.open_date.strftime('%Y-%m-%d %H:%M:%S')}" r"\) due to Traceback \(most recent call last\):\n*", caplog, @@ -3751,8 +3751,8 @@ def test_get_real_amount_quote( # Amount is reduced by "fee" assert freqtrade.get_real_amount(trade, buy_order_fee, order_obj) == (amount * 0.001) assert log_has( - "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8.00000000, is_short=False," - " leverage=1.0, open_rate=0.24544100, open_since=closed), fee=0.008.", + "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8, is_short=False," + " leverage=1, open_rate=0.245441, open_since=closed), fee=0.008.", caplog, ) @@ -3805,8 +3805,8 @@ def test_get_real_amount_no_trade(default_conf_usdt, buy_order_fee, caplog, mock # Amount is reduced by "fee" assert freqtrade.get_real_amount(trade, buy_order_fee, order_obj) is None assert log_has( - "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8.00000000, " - "is_short=False, leverage=1.0, open_rate=0.24544100, open_since=closed) failed: " + "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8, " + "is_short=False, leverage=1, open_rate=0.245441, open_since=closed) failed: " "myTrade-dict empty found", caplog, ) @@ -3825,8 +3825,8 @@ def test_get_real_amount_no_trade(default_conf_usdt, buy_order_fee, caplog, mock 0, True, ( - "Fee for Trade Trade(id=None, pair=LTC/ETH, amount=8.00000000, is_short=False, " - "leverage=1.0, open_rate=0.24544100, open_since=closed) [buy]: 0.00094518 BNB -" + "Fee for Trade Trade(id=None, pair=LTC/ETH, amount=8, is_short=False, " + "leverage=1, open_rate=0.245441, open_since=closed) [buy]: 0.00094518 BNB -" " rate: None" ), ), @@ -3836,8 +3836,8 @@ def test_get_real_amount_no_trade(default_conf_usdt, buy_order_fee, caplog, mock 0.004, False, ( - "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8.00000000, " - "is_short=False, leverage=1.0, open_rate=0.24544100, open_since=closed), fee=0.004." + "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8, " + "is_short=False, leverage=1, open_rate=0.245441, open_since=closed), fee=0.004." ), ), # invalid, no currency in from fee dict @@ -3941,8 +3941,8 @@ def test_get_real_amount_multi( assert freqtrade.get_real_amount(trade, buy_order_fee, order_obj) == expected_amount assert log_has( ( - "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8.00000000, " - "is_short=False, leverage=1.0, open_rate=0.24544100, open_since=closed), " + "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8, " + "is_short=False, leverage=1, open_rate=0.245441, open_since=closed), " f"fee={expected_amount}." ), caplog, diff --git a/tests/persistence/test_persistence.py b/tests/persistence/test_persistence.py index 8fcc59691..6e779137d 100644 --- a/tests/persistence/test_persistence.py +++ b/tests/persistence/test_persistence.py @@ -372,8 +372,8 @@ def test_borrowed(fee, is_short, lev, borrowed, trading_mode): @pytest.mark.parametrize( "is_short,open_rate,close_rate,lev,profit,trading_mode", [ - (False, 2.0, 2.2, 1.0, 0.09451372, spot), - (True, 2.2, 2.0, 3.0, 0.25894253, margin), + (False, 2, 2.2, 1, 0.09451372, spot), + (True, 2.2, 2.0, 3, 0.25894253, margin), ], ) @pytest.mark.usefixtures("init_persistence") @@ -493,8 +493,8 @@ def test_update_limit_order( assert trade.close_date is None assert log_has_re( f"LIMIT_{entry_side.upper()} has been fulfilled for " - r"Trade\(id=2, pair=ADA/USDT, amount=30.00000000, " - f"is_short={is_short}, leverage={lev}, open_rate={open_rate}0000000, " + r"Trade\(id=2, pair=ADA/USDT, amount=30, " + f"is_short={is_short}, leverage={lev}, open_rate={open_rate}, " r"open_since=.*\).", caplog, ) @@ -511,8 +511,8 @@ def test_update_limit_order( assert trade.close_date is not None assert log_has_re( f"LIMIT_{exit_side.upper()} has been fulfilled for " - r"Trade\(id=2, pair=ADA/USDT, amount=30.00000000, " - f"is_short={is_short}, leverage={lev}, open_rate={open_rate}0000000, " + r"Trade\(id=2, pair=ADA/USDT, amount=30, " + f"is_short={is_short}, leverage={lev}, open_rate={open_rate}, " r"open_since=.*\).", caplog, ) @@ -545,8 +545,8 @@ def test_update_market_order(market_buy_order_usdt, market_sell_order_usdt, fee, assert trade.close_date is None assert log_has_re( r"MARKET_BUY has been fulfilled for Trade\(id=1, " - r"pair=ADA/USDT, amount=30.00000000, is_short=False, leverage=1.0, " - r"open_rate=2.00000000, open_since=.*\).", + r"pair=ADA/USDT, amount=30, is_short=False, leverage=1, " + r"open_rate=2, open_since=.*\).", caplog, ) @@ -561,8 +561,8 @@ def test_update_market_order(market_buy_order_usdt, market_sell_order_usdt, fee, assert trade.close_date is not None assert log_has_re( r"MARKET_SELL has been fulfilled for Trade\(id=1, " - r"pair=ADA/USDT, amount=30.00000000, is_short=False, leverage=1.0, " - r"open_rate=2.00000000, open_since=.*\).", + r"pair=ADA/USDT, amount=30, is_short=False, leverage=1, " + r"open_rate=2, open_since=.*\).", caplog, )