Merge pull request #1571 from hroff-1902/patch-9

multiple --config options

freqtrade/tests/test_arguments.py

@@ -16,7 +16,7 @@ def test_parse_args_none() -> None:
 
 def test_parse_args_defaults() -> None:
     args = Arguments([], '').get_parsed_arg()
-    assert args.config == 'config.json'
+    assert args.config == ['config.json']
     assert args.strategy_path is None
     assert args.datadir is None
     assert args.loglevel == 0
@@ -24,10 +24,15 @@ def test_parse_args_defaults() -> None:
 
 def test_parse_args_config() -> None:
     args = Arguments(['-c', '/dev/null'], '').get_parsed_arg()
-    assert args.config == '/dev/null'
+    assert args.config == ['/dev/null']
 
     args = Arguments(['--config', '/dev/null'], '').get_parsed_arg()
-    assert args.config == '/dev/null'
+    assert args.config == ['/dev/null']
+
+    args = Arguments(['--config', '/dev/null',
+                      '--config', '/dev/zero'],
+                     '').get_parsed_arg()
+    assert args.config == ['/dev/null', '/dev/zero']
 
 
 def test_parse_args_db_url() -> None:
@@ -139,7 +144,7 @@ def test_parse_args_backtesting_custom() -> None:
         'TestStrategy'
         ]
     call_args = Arguments(args, '').get_parsed_arg()
-    assert call_args.config == 'test_conf.json'
+    assert call_args.config == ['test_conf.json']
     assert call_args.live is True
     assert call_args.loglevel == 0
     assert call_args.subparser == 'backtesting'
@@ -158,7 +163,7 @@ def test_parse_args_hyperopt_custom() -> None:
         '--spaces', 'buy'
     ]
     call_args = Arguments(args, '').get_parsed_arg()
-    assert call_args.config == 'test_conf.json'
+    assert call_args.config == ['test_conf.json']
     assert call_args.epochs == 20
     assert call_args.loglevel == 0
     assert call_args.subparser == 'hyperopt'

freqtrade/tests/test_configuration.py

@@ -1,15 +1,15 @@
 # pragma pylint: disable=missing-docstring, protected-access, invalid-name
 
 import json
-from argparse import Namespace
 import logging
+from argparse import Namespace
+from copy import deepcopy
 from unittest.mock import MagicMock
 
 import pytest
-from jsonschema import validate, ValidationError, Draft4Validator
+from jsonschema import Draft4Validator, ValidationError, validate
 
-from freqtrade import constants
-from freqtrade import OperationalException
+from freqtrade import OperationalException, constants
 from freqtrade.arguments import Arguments
 from freqtrade.configuration import Configuration, set_loggers
 from freqtrade.constants import DEFAULT_DB_DRYRUN_URL, DEFAULT_DB_PROD_URL
@@ -50,18 +50,49 @@ def test_load_config_file(default_conf, mocker, caplog) -> None:
     validated_conf = configuration._load_config_file('somefile')
     assert file_mock.call_count == 1
     assert validated_conf.items() >= default_conf.items()
-    assert 'internals' in validated_conf
-    assert log_has('Validating configuration ...', caplog.record_tuples)
 
 
 def test_load_config_max_open_trades_zero(default_conf, mocker, caplog) -> None:
     default_conf['max_open_trades'] = 0
-    file_mock = mocker.patch('freqtrade.configuration.open', mocker.mock_open(
+    mocker.patch('freqtrade.configuration.open', mocker.mock_open(
         read_data=json.dumps(default_conf)
     ))
 
-    Configuration(Namespace())._load_config_file('somefile')
-    assert file_mock.call_count == 1
+    args = Arguments([], '').get_parsed_arg()
+    configuration = Configuration(args)
+    validated_conf = configuration.load_config()
+
+    assert validated_conf['max_open_trades'] == 0
+    assert 'internals' in validated_conf
+    assert log_has('Validating configuration ...', caplog.record_tuples)
+
+
+def test_load_config_combine_dicts(default_conf, mocker, caplog) -> None:
+    conf1 = deepcopy(default_conf)
+    conf2 = deepcopy(default_conf)
+    del conf1['exchange']['key']
+    del conf1['exchange']['secret']
+    del conf2['exchange']['name']
+    conf2['exchange']['pair_whitelist'] += ['NANO/BTC']
+
+    config_files = [conf1, conf2]
+
+    configsmock = MagicMock(side_effect=config_files)
+    mocker.patch('freqtrade.configuration.Configuration._load_config_file', configsmock)
+
+    arg_list = ['-c', 'test_conf.json', '--config', 'test2_conf.json', ]
+    args = Arguments(arg_list, '').get_parsed_arg()
+    configuration = Configuration(args)
+    validated_conf = configuration.load_config()
+
+    exchange_conf = default_conf['exchange']
+    assert validated_conf['exchange']['name'] == exchange_conf['name']
+    assert validated_conf['exchange']['key'] == exchange_conf['key']
+    assert validated_conf['exchange']['secret'] == exchange_conf['secret']
+    assert validated_conf['exchange']['pair_whitelist'] != conf1['exchange']['pair_whitelist']
+    assert validated_conf['exchange']['pair_whitelist'] == conf2['exchange']['pair_whitelist']
+
+    assert 'internals' in validated_conf
     assert log_has('Validating configuration ...', caplog.record_tuples)
 
 

freqtrade/tests/test_main.py

@@ -22,7 +22,7 @@ def test_parse_args_backtesting(mocker) -> None:
     main(['backtesting'])
     assert backtesting_mock.call_count == 1
     call_args = backtesting_mock.call_args[0][0]
-    assert call_args.config == 'config.json'
+    assert call_args.config == ['config.json']
     assert call_args.live is False
     assert call_args.loglevel == 0
     assert call_args.subparser == 'backtesting'
@@ -35,7 +35,7 @@ def test_main_start_hyperopt(mocker) -> None:
     main(['hyperopt'])
     assert hyperopt_mock.call_count == 1
     call_args = hyperopt_mock.call_args[0][0]
-    assert call_args.config == 'config.json'
+    assert call_args.config == ['config.json']
     assert call_args.loglevel == 0
     assert call_args.subparser == 'hyperopt'
     assert call_args.func is not None