Adjust tests to not use --refresh-pairs
This commit is contained in:
parent
1cd8ed0c1a
commit
e66fa1cec6
@ -45,7 +45,6 @@ def test_historic_ohlcv(mocker, default_conf, ticker_history):
|
|||||||
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
||||||
assert isinstance(data, DataFrame)
|
assert isinstance(data, DataFrame)
|
||||||
assert historymock.call_count == 1
|
assert historymock.call_count == 1
|
||||||
assert historymock.call_args_list[0][1]["refresh_pairs"] is False
|
|
||||||
assert historymock.call_args_list[0][1]["ticker_interval"] == "5m"
|
assert historymock.call_args_list[0][1]["ticker_interval"] == "5m"
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,8 +74,7 @@ def test_load_data_7min_ticker(mocker, caplog, default_conf, testdatadir) -> Non
|
|||||||
assert ld is None
|
assert ld is None
|
||||||
assert log_has(
|
assert log_has(
|
||||||
'No history data for pair: "UNITTEST/BTC", interval: 7m. '
|
'No history data for pair: "UNITTEST/BTC", interval: 7m. '
|
||||||
'Use --refresh-pairs-cached option or `freqtrade download-data` '
|
'Use `freqtrade download-data` to download the data', caplog
|
||||||
'script to download the data', caplog
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -105,13 +104,11 @@ def test_load_data_with_new_pair_1min(ticker_history_list, mocker, caplog,
|
|||||||
# do not download a new pair if refresh_pairs isn't set
|
# do not download a new pair if refresh_pairs isn't set
|
||||||
history.load_pair_history(datadir=testdatadir,
|
history.load_pair_history(datadir=testdatadir,
|
||||||
ticker_interval='1m',
|
ticker_interval='1m',
|
||||||
refresh_pairs=False,
|
|
||||||
pair='MEME/BTC')
|
pair='MEME/BTC')
|
||||||
assert os.path.isfile(file) is False
|
assert os.path.isfile(file) is False
|
||||||
assert log_has(
|
assert log_has(
|
||||||
'No history data for pair: "MEME/BTC", interval: 1m. '
|
'No history data for pair: "MEME/BTC", interval: 1m. '
|
||||||
'Use --refresh-pairs-cached option or `freqtrade download-data` '
|
'Use `freqtrade download-data` to download the data', caplog
|
||||||
'script to download the data', caplog
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# download a new pair if refresh_pairs is set
|
# download a new pair if refresh_pairs is set
|
||||||
|
@ -197,7 +197,6 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) ->
|
|||||||
assert config['runmode'] == RunMode.BACKTEST
|
assert config['runmode'] == RunMode.BACKTEST
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.filterwarnings("ignore:DEPRECATED")
|
|
||||||
def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
||||||
patched_configuration_load_config_file(mocker, default_conf)
|
patched_configuration_load_config_file(mocker, default_conf)
|
||||||
mocker.patch(
|
mocker.patch(
|
||||||
@ -213,7 +212,6 @@ def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) ->
|
|||||||
'--ticker-interval', '1m',
|
'--ticker-interval', '1m',
|
||||||
'--enable-position-stacking',
|
'--enable-position-stacking',
|
||||||
'--disable-max-market-positions',
|
'--disable-max-market-positions',
|
||||||
'--refresh-pairs-cached',
|
|
||||||
'--timerange', ':100',
|
'--timerange', ':100',
|
||||||
'--export', '/bar/foo',
|
'--export', '/bar/foo',
|
||||||
'--export-filename', 'foo_bar.json'
|
'--export-filename', 'foo_bar.json'
|
||||||
@ -240,9 +238,6 @@ def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) ->
|
|||||||
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
||||||
assert log_has('max_open_trades set to unlimited ...', caplog)
|
assert log_has('max_open_trades set to unlimited ...', caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs' in config
|
|
||||||
assert log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
|
|
||||||
assert 'timerange' in config
|
assert 'timerange' in config
|
||||||
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
||||||
|
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from freqtrade.edge import PairInfo
|
from freqtrade.edge import PairInfo
|
||||||
from freqtrade.optimize import setup_configuration, start_edge
|
from freqtrade.optimize import setup_configuration, start_edge
|
||||||
from freqtrade.optimize.edge_cli import EdgeCli
|
from freqtrade.optimize.edge_cli import EdgeCli
|
||||||
@ -35,14 +33,10 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) ->
|
|||||||
assert 'ticker_interval' in config
|
assert 'ticker_interval' in config
|
||||||
assert not log_has_re('Parameter -i/--ticker-interval detected .*', caplog)
|
assert not log_has_re('Parameter -i/--ticker-interval detected .*', caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs' not in config
|
|
||||||
assert not log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
|
|
||||||
assert 'timerange' not in config
|
assert 'timerange' not in config
|
||||||
assert 'stoploss_range' not in config
|
assert 'stoploss_range' not in config
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.filterwarnings("ignore:DEPRECATED")
|
|
||||||
def test_setup_edge_configuration_with_arguments(mocker, edge_conf, caplog) -> None:
|
def test_setup_edge_configuration_with_arguments(mocker, edge_conf, caplog) -> None:
|
||||||
patched_configuration_load_config_file(mocker, edge_conf)
|
patched_configuration_load_config_file(mocker, edge_conf)
|
||||||
mocker.patch(
|
mocker.patch(
|
||||||
@ -56,7 +50,6 @@ def test_setup_edge_configuration_with_arguments(mocker, edge_conf, caplog) -> N
|
|||||||
'--datadir', '/foo/bar',
|
'--datadir', '/foo/bar',
|
||||||
'edge',
|
'edge',
|
||||||
'--ticker-interval', '1m',
|
'--ticker-interval', '1m',
|
||||||
'--refresh-pairs-cached',
|
|
||||||
'--timerange', ':100',
|
'--timerange', ':100',
|
||||||
'--stoplosses=-0.01,-0.10,-0.001'
|
'--stoplosses=-0.01,-0.10,-0.001'
|
||||||
]
|
]
|
||||||
@ -74,8 +67,6 @@ def test_setup_edge_configuration_with_arguments(mocker, edge_conf, caplog) -> N
|
|||||||
assert log_has('Parameter -i/--ticker-interval detected ... Using ticker_interval: 1m ...',
|
assert log_has('Parameter -i/--ticker-interval detected ... Using ticker_interval: 1m ...',
|
||||||
caplog)
|
caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs' in config
|
|
||||||
assert log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
assert 'timerange' in config
|
assert 'timerange' in config
|
||||||
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
||||||
|
|
||||||
|
@ -94,7 +94,6 @@ def test_setup_hyperopt_configuration_without_arguments(mocker, default_conf, ca
|
|||||||
assert config['runmode'] == RunMode.HYPEROPT
|
assert config['runmode'] == RunMode.HYPEROPT
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.filterwarnings("ignore:DEPRECATED")
|
|
||||||
def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
||||||
patched_configuration_load_config_file(mocker, default_conf)
|
patched_configuration_load_config_file(mocker, default_conf)
|
||||||
mocker.patch(
|
mocker.patch(
|
||||||
@ -108,7 +107,6 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo
|
|||||||
'hyperopt',
|
'hyperopt',
|
||||||
'--ticker-interval', '1m',
|
'--ticker-interval', '1m',
|
||||||
'--timerange', ':100',
|
'--timerange', ':100',
|
||||||
'--refresh-pairs-cached',
|
|
||||||
'--enable-position-stacking',
|
'--enable-position-stacking',
|
||||||
'--disable-max-market-positions',
|
'--disable-max-market-positions',
|
||||||
'--epochs', '1000',
|
'--epochs', '1000',
|
||||||
@ -137,9 +135,6 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo
|
|||||||
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
||||||
assert log_has('max_open_trades set to unlimited ...', caplog)
|
assert log_has('max_open_trades set to unlimited ...', caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs' in config
|
|
||||||
assert log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
|
|
||||||
assert 'timerange' in config
|
assert 'timerange' in config
|
||||||
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
||||||
|
|
||||||
|
@ -99,7 +99,6 @@ def test_parse_args_backtesting_custom() -> None:
|
|||||||
'-c', 'test_conf.json',
|
'-c', 'test_conf.json',
|
||||||
'backtesting',
|
'backtesting',
|
||||||
'--ticker-interval', '1m',
|
'--ticker-interval', '1m',
|
||||||
'--refresh-pairs-cached',
|
|
||||||
'--strategy-list',
|
'--strategy-list',
|
||||||
'DefaultStrategy',
|
'DefaultStrategy',
|
||||||
'SampleStrategy'
|
'SampleStrategy'
|
||||||
@ -110,7 +109,6 @@ def test_parse_args_backtesting_custom() -> None:
|
|||||||
assert call_args["subparser"] == 'backtesting'
|
assert call_args["subparser"] == 'backtesting'
|
||||||
assert call_args["func"] is not None
|
assert call_args["func"] is not None
|
||||||
assert call_args["ticker_interval"] == '1m'
|
assert call_args["ticker_interval"] == '1m'
|
||||||
assert call_args["refresh_pairs"] is True
|
|
||||||
assert type(call_args["strategy_list"]) is list
|
assert type(call_args["strategy_list"]) is list
|
||||||
assert len(call_args["strategy_list"]) == 2
|
assert len(call_args["strategy_list"]) == 2
|
||||||
|
|
||||||
|
@ -341,14 +341,10 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) ->
|
|||||||
assert 'position_stacking' not in config
|
assert 'position_stacking' not in config
|
||||||
assert not log_has('Parameter --enable-position-stacking detected ...', caplog)
|
assert not log_has('Parameter --enable-position-stacking detected ...', caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs' not in config
|
|
||||||
assert not log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
|
|
||||||
assert 'timerange' not in config
|
assert 'timerange' not in config
|
||||||
assert 'export' not in config
|
assert 'export' not in config
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.filterwarnings("ignore:DEPRECATED")
|
|
||||||
def test_setup_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
def test_setup_configuration_with_arguments(mocker, default_conf, caplog) -> None:
|
||||||
patched_configuration_load_config_file(mocker, default_conf)
|
patched_configuration_load_config_file(mocker, default_conf)
|
||||||
mocker.patch(
|
mocker.patch(
|
||||||
@ -368,7 +364,6 @@ def test_setup_configuration_with_arguments(mocker, default_conf, caplog) -> Non
|
|||||||
'--ticker-interval', '1m',
|
'--ticker-interval', '1m',
|
||||||
'--enable-position-stacking',
|
'--enable-position-stacking',
|
||||||
'--disable-max-market-positions',
|
'--disable-max-market-positions',
|
||||||
'--refresh-pairs-cached',
|
|
||||||
'--timerange', ':100',
|
'--timerange', ':100',
|
||||||
'--export', '/bar/foo'
|
'--export', '/bar/foo'
|
||||||
]
|
]
|
||||||
@ -398,8 +393,6 @@ def test_setup_configuration_with_arguments(mocker, default_conf, caplog) -> Non
|
|||||||
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
assert log_has('Parameter --disable-max-market-positions detected ...', caplog)
|
||||||
assert log_has('max_open_trades set to unlimited ...', caplog)
|
assert log_has('max_open_trades set to unlimited ...', caplog)
|
||||||
|
|
||||||
assert 'refresh_pairs'in config
|
|
||||||
assert log_has('Parameter -r/--refresh-pairs-cached detected ...', caplog)
|
|
||||||
assert 'timerange' in config
|
assert 'timerange' in config
|
||||||
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
assert log_has('Parameter --timerange detected: {} ...'.format(config['timerange']), caplog)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user