mirror of
https://github.com/freqtrade/freqtrade.git
synced 2026-03-01 07:42:40 +00:00
Merge branch 'develop' into pr/x-mass/12315
This commit is contained in:
@@ -6,19 +6,19 @@ from freqtrade.persistence import FtNoDBContext, PairLocks, Trade
|
||||
@pytest.mark.parametrize("timeframe", ["", "5m", "1d"])
|
||||
def test_FtNoDBContext(timeframe):
|
||||
PairLocks.timeframe = ""
|
||||
assert Trade.use_db is True
|
||||
assert PairLocks.use_db is True
|
||||
assert Trade.use_db
|
||||
assert PairLocks.use_db
|
||||
assert PairLocks.timeframe == ""
|
||||
|
||||
with FtNoDBContext(timeframe):
|
||||
assert Trade.use_db is False
|
||||
assert PairLocks.use_db is False
|
||||
assert not Trade.use_db
|
||||
assert not PairLocks.use_db
|
||||
assert PairLocks.timeframe == timeframe
|
||||
|
||||
with FtNoDBContext():
|
||||
assert Trade.use_db is False
|
||||
assert PairLocks.use_db is False
|
||||
assert not Trade.use_db
|
||||
assert not PairLocks.use_db
|
||||
assert PairLocks.timeframe == ""
|
||||
|
||||
assert Trade.use_db is True
|
||||
assert PairLocks.use_db is True
|
||||
assert Trade.use_db
|
||||
assert PairLocks.use_db
|
||||
|
||||
@@ -441,7 +441,8 @@ def test_migrate_pairlocks(mocker, default_conf, fee, caplog):
|
||||
"dialect",
|
||||
[
|
||||
"sqlite",
|
||||
"postgresql",
|
||||
"postgresql", # test for psycopg2 compat
|
||||
"postgresql.psycopg", # test for psycopg3 compat
|
||||
"mysql",
|
||||
"oracle",
|
||||
"mssql",
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
@@ -1479,6 +1479,8 @@ def test_to_json(fee):
|
||||
"contract_size": 1,
|
||||
"orders": [],
|
||||
"has_open_orders": False,
|
||||
"nr_of_successful_entries": 0,
|
||||
"nr_of_successful_exits": 0,
|
||||
}
|
||||
|
||||
# Simulate dry_run entries
|
||||
@@ -1570,6 +1572,8 @@ def test_to_json(fee):
|
||||
"contract_size": 1,
|
||||
"orders": [],
|
||||
"has_open_orders": False,
|
||||
"nr_of_successful_entries": 0,
|
||||
"nr_of_successful_exits": 0,
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user