From 28e51e2dfb01d79c5c2898efece6e91aeb2d0d24 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 20 Jan 2023 08:28:50 +0000 Subject: [PATCH] Simplify some test setups --- tests/conftest.py | 1 - tests/optimize/test_backtesting.py | 5 ----- tests/test_binance_mig.py | 1 - tests/test_plotting.py | 1 - 4 files changed, 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 63dbc6941..06a86c3b3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -241,7 +241,6 @@ def get_patched_freqtradebot(mocker, config) -> FreqtradeBot: :return: FreqtradeBot """ patch_freqtradebot(mocker, config) - config['datadir'] = Path(config['datadir']) return FreqtradeBot(config) diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index b17cb8dbb..985209887 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -359,7 +359,6 @@ def test_backtesting_start(default_conf, mocker, testdatadir, caplog) -> None: PropertyMock(return_value=['UNITTEST/BTC'])) default_conf['timeframe'] = '1m' - default_conf['datadir'] = testdatadir default_conf['export'] = 'signals' default_conf['exportfilename'] = 'export.txt' default_conf['timerange'] = '-1510694220' @@ -395,7 +394,6 @@ def test_backtesting_start_no_data(default_conf, mocker, caplog, testdatadir) -> PropertyMock(return_value=['UNITTEST/BTC'])) default_conf['timeframe'] = "1m" - default_conf['datadir'] = testdatadir default_conf['export'] = 'none' default_conf['timerange'] = '20180101-20180102' @@ -416,7 +414,6 @@ def test_backtesting_no_pair_left(default_conf, mocker, caplog, testdatadir) -> PropertyMock(return_value=[])) default_conf['timeframe'] = "1m" - default_conf['datadir'] = testdatadir default_conf['export'] = 'none' default_conf['timerange'] = '20180101-20180102' @@ -450,7 +447,6 @@ def test_backtesting_pairlist_list(default_conf, mocker, caplog, testdatadir, ti mocker.patch('freqtrade.plugins.pairlistmanager.PairListManager.refresh_pairlist') default_conf['ticker_interval'] = "1m" - default_conf['datadir'] = testdatadir default_conf['export'] = 'none' # Use stoploss from strategy del default_conf['stoploss'] @@ -548,7 +544,6 @@ def test_backtest__enter_trade_futures(default_conf_usdt, fee, mocker) -> None: default_conf_usdt['trading_mode'] = 'futures' default_conf_usdt['margin_mode'] = 'isolated' default_conf_usdt['stake_currency'] = 'USDT' - default_conf_usdt['datadir'] = Path(default_conf_usdt['datadir']) default_conf_usdt['exchange']['pair_whitelist'] = ['.*'] backtesting = Backtesting(default_conf_usdt) backtesting._set_strategy(backtesting.strategylist[0]) diff --git a/tests/test_binance_mig.py b/tests/test_binance_mig.py index a93ffbd28..5a5bbe9dc 100644 --- a/tests/test_binance_mig.py +++ b/tests/test_binance_mig.py @@ -53,7 +53,6 @@ def test_binance_mig_db_conversion(default_conf_usdt, fee, caplog): t.exchange = 'binance' Trade.commit() - default_conf_usdt['datadir'] = Path(default_conf_usdt['datadir']) default_conf_usdt['trading_mode'] = 'futures' migrate_binance_futures_names(default_conf_usdt) assert log_has('Migrating binance futures pairs in database.', caplog) diff --git a/tests/test_plotting.py b/tests/test_plotting.py index e05796801..9f04ba20a 100644 --- a/tests/test_plotting.py +++ b/tests/test_plotting.py @@ -449,7 +449,6 @@ def test_start_plot_profit_error(mocker): def test_plot_profit(default_conf, mocker, testdatadir): patch_exchange(mocker) default_conf['trade_source'] = 'file' - default_conf['datadir'] = testdatadir default_conf['exportfilename'] = testdatadir / 'backtest-result_test_nofile.json' default_conf['pairs'] = ['ETH/BTC', 'LTC/BTC']