diff --git a/tests/conftest.py b/tests/conftest.py index 1ff3da08c..63dbc6941 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -510,7 +510,7 @@ def get_default_conf(testdatadir): "chat_id": "0", "notification_settings": {}, }, - "datadir": str(testdatadir), + "datadir": Path(testdatadir), "initial_state": "running", "db_url": "sqlite://", "user_data_dir": Path("user_data"), diff --git a/tests/test_configuration.py b/tests/test_configuration.py index cdf9f2f2e..a2a1b72cc 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -58,6 +58,7 @@ def test_load_config_incorrect_stake_amount(default_conf) -> None: def test_load_config_file(default_conf, mocker, caplog) -> None: del default_conf['user_data_dir'] + default_conf['datadir'] = str(default_conf['datadir']) file_mock = mocker.patch('freqtrade.configuration.load_config.open', mocker.mock_open( read_data=json.dumps(default_conf) )) @@ -69,6 +70,7 @@ def test_load_config_file(default_conf, mocker, caplog) -> None: def test_load_config_file_error(default_conf, mocker, caplog) -> None: del default_conf['user_data_dir'] + default_conf['datadir'] = str(default_conf['datadir']) filedata = json.dumps(default_conf).replace( '"stake_amount": 0.001,', '"stake_amount": .001,') mocker.patch('freqtrade.configuration.load_config.open', mocker.mock_open(read_data=filedata)) @@ -80,6 +82,7 @@ def test_load_config_file_error(default_conf, mocker, caplog) -> None: def test_load_config_file_error_range(default_conf, mocker, caplog) -> None: del default_conf['user_data_dir'] + default_conf['datadir'] = str(default_conf['datadir']) filedata = json.dumps(default_conf).replace( '"stake_amount": 0.001,', '"stake_amount": .001,') mocker.patch.object(Path, "read_text", MagicMock(return_value=filedata)) @@ -238,6 +241,7 @@ def test_print_config(default_conf, mocker, caplog) -> None: conf1 = deepcopy(default_conf) # Delete non-json elements from default_conf del conf1['user_data_dir'] + conf1['datadir'] = str(conf1['datadir']) config_files = [conf1] configsmock = MagicMock(side_effect=config_files) diff --git a/tests/test_plotting.py b/tests/test_plotting.py index 7662ea7f1..e05796801 100644 --- a/tests/test_plotting.py +++ b/tests/test_plotting.py @@ -45,7 +45,6 @@ def test_init_plotscript(default_conf, mocker, testdatadir): default_conf['timerange'] = "20180110-20180112" default_conf['trade_source'] = "file" default_conf['timeframe'] = "5m" - default_conf["datadir"] = testdatadir default_conf['exportfilename'] = testdatadir / "backtest-result.json" supported_markets = ["TRX/BTC", "ADA/BTC"] ret = init_plotscript(default_conf, supported_markets) @@ -394,7 +393,6 @@ def test_load_and_plot_trades(default_conf, mocker, caplog, testdatadir): patch_exchange(mocker) default_conf['trade_source'] = 'file' - default_conf["datadir"] = testdatadir default_conf['exportfilename'] = testdatadir / "backtest-result.json" default_conf['indicators1'] = ["sma5", "ema10"] default_conf['indicators2'] = ["macd"]