From d8b51875bf299ab9ebba03f2de0b98b0b0bac24e Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 27 Apr 2025 11:35:06 +0200 Subject: [PATCH] test: update tests for new file structure --- tests/data/test_btanalysis.py | 16 +++++++++------- tests/optimize/test_backtesting.py | 2 +- tests/rpc/test_rpc_apiserver.py | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/data/test_btanalysis.py b/tests/data/test_btanalysis.py index 6956c0ade..6531c6e2e 100644 --- a/tests/data/test_btanalysis.py +++ b/tests/data/test_btanalysis.py @@ -56,7 +56,7 @@ def test_get_latest_backtest_filename(testdatadir, mocker): res = get_latest_backtest_filename(str(testdir_bt)) assert res == "backtest-result.json" - mocker.patch("freqtrade.data.btanalysis.json_load", return_value={}) + mocker.patch("freqtrade.data.btanalysis.bt_fileutils.json_load", return_value={}) with pytest.raises(ValueError, match=r"Invalid '.last_result.json' format."): get_latest_backtest_filename(testdir_bt) @@ -84,8 +84,8 @@ def test_load_backtest_metadata(mocker, testdatadir): res = load_backtest_metadata(testdatadir / "nonexistent.file.json") assert res == {} - mocker.patch("freqtrade.data.btanalysis.get_backtest_metadata_filename") - mocker.patch("freqtrade.data.btanalysis.json_load", side_effect=Exception()) + mocker.patch("freqtrade.data.btanalysis.bt_fileutils.get_backtest_metadata_filename") + mocker.patch("freqtrade.data.btanalysis.bt_fileutils.json_load", side_effect=Exception()) with pytest.raises( OperationalException, match=r"Unexpected error.*loading backtest metadata\." ): @@ -94,7 +94,7 @@ def test_load_backtest_metadata(mocker, testdatadir): def test_load_backtest_data_old_format(testdatadir, mocker): filename = testdatadir / "backtest-result_test222.json" - mocker.patch("freqtrade.data.btanalysis.load_backtest_stats", return_value=[]) + mocker.patch("freqtrade.data.btanalysis.bt_fileutils.load_backtest_stats", return_value=[]) with pytest.raises( OperationalException, @@ -149,7 +149,7 @@ def test_load_backtest_data_multi(testdatadir): def test_load_trades_from_db(default_conf, fee, is_short, mocker): create_mock_trades(fee, is_short) # remove init so it does not init again - init_mock = mocker.patch("freqtrade.data.btanalysis.init_db", MagicMock()) + init_mock = mocker.patch("freqtrade.data.btanalysis.bt_fileutils.init_db", MagicMock()) trades = load_trades_from_db(db_url=default_conf["db_url"]) assert init_mock.call_count == 1 @@ -221,8 +221,10 @@ def test_analyze_trade_parallelism(testdatadir): def test_load_trades(default_conf, mocker): - db_mock = mocker.patch("freqtrade.data.btanalysis.load_trades_from_db", MagicMock()) - bt_mock = mocker.patch("freqtrade.data.btanalysis.load_backtest_data", MagicMock()) + db_mock = mocker.patch( + "freqtrade.data.btanalysis.bt_fileutils.load_trades_from_db", MagicMock() + ) + bt_mock = mocker.patch("freqtrade.data.btanalysis.bt_fileutils.load_backtest_data", MagicMock()) load_trades( "DB", diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index d5bc7d5b4..b3e23249c 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -2576,7 +2576,7 @@ def test_backtest_start_multi_strat_caching( ], ) mocker.patch.multiple( - "freqtrade.data.btanalysis", + "freqtrade.data.btanalysis.bt_fileutils", load_backtest_metadata=load_backtest_metadata, load_backtest_stats=load_backtest_stats, ) diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index 89251233b..9bb7e8318 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -2869,7 +2869,7 @@ def test_api_backtesting(botclient, mocker, fee, caplog, tmp_path): def test_api_backtest_history(botclient, mocker, testdatadir): ftbot, client = botclient mocker.patch( - "freqtrade.data.btanalysis._get_backtest_files", + "freqtrade.data.btanalysis.bt_fileutils._get_backtest_files", return_value=[ testdatadir / "backtest_results/backtest-result_multistrat.json", testdatadir / "backtest_results/backtest-result.json",