From acc69e0d2e9cde65d1e16ff3001414ad70cfc5b4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 7 Dec 2025 15:59:45 +0100 Subject: [PATCH] test: fix a couple more tests --- tests/data/test_datahandler.py | 1 - tests/optimize/test_backtesting.py | 13 ++++++------- .../futures/XRP_USDT_USDT-8h-mark.feather | Bin 7594 -> 0 bytes 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 tests/testdata/futures/XRP_USDT_USDT-8h-mark.feather diff --git a/tests/data/test_datahandler.py b/tests/data/test_datahandler.py index e9fa95610..9d40bf5cb 100644 --- a/tests/data/test_datahandler.py +++ b/tests/data/test_datahandler.py @@ -126,7 +126,6 @@ def test_datahandler_ohlcv_get_available_data(testdatadir): ("XRP/USDT:USDT", "5m", "futures"), ("XRP/USDT:USDT", "1h", "futures"), ("XRP/USDT:USDT", "1h", "mark"), - ("XRP/USDT:USDT", "8h", "mark"), ("XRP/USDT:USDT", "1h", "funding_rate"), } diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index b1d13756f..bbf55d2bc 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -970,8 +970,8 @@ def test_backtest_one_detail(default_conf_usdt, mocker, testdatadir, use_detail) @pytest.mark.parametrize( "use_detail,exp_funding_fee, exp_ff_updates", [ - (True, -0.018054162, 10), - (False, -0.01780296, 6), + (True, -0.0180457882, 15), + (False, -0.0178000543, 12), ], ) def test_backtest_one_detail_futures( @@ -1081,8 +1081,8 @@ def test_backtest_one_detail_futures( @pytest.mark.parametrize( "use_detail,entries,max_stake,ff_updates,expected_ff", [ - (True, 50, 3000, 55, -1.18038144), - (False, 6, 360, 11, -0.14679994), + (True, 50, 3000, 78, -1.17988972), + (False, 6, 360, 34, -0.14673681), ], ) def test_backtest_one_detail_futures_funding_fees( @@ -2382,13 +2382,12 @@ def test_backtest_start_nomock_futures(default_conf_usdt, mocker, caplog, testda f"Using data directory: {testdatadir} ...", "Loading data from 2021-11-17 01:00:00 up to 2021-11-21 04:00:00 (4 days).", "Backtesting with data from 2021-11-17 21:00:00 up to 2021-11-21 04:00:00 (3 days).", - "XRP/USDT:USDT, funding_rate, 8h, data starts at 2021-11-18 00:00:00", - "XRP/USDT:USDT, mark, 8h, data starts at 2021-11-18 00:00:00", + "XRP/USDT:USDT, funding_rate, 1h, data starts at 2021-11-18 00:00:00", f"Running backtesting for Strategy {CURRENT_TEST_STRATEGY}", ] for line in exists: - assert log_has(line, caplog) + assert log_has(line, caplog), line captured = capsys.readouterr() assert "BACKTESTING REPORT" in captured.out diff --git a/tests/testdata/futures/XRP_USDT_USDT-8h-mark.feather b/tests/testdata/futures/XRP_USDT_USDT-8h-mark.feather deleted file mode 100644 index f41502690473eada1348441973210c9d7fc0350f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7594 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