Adapt after rebase

This commit is contained in:
Matthias
2018-07-31 21:08:03 +02:00
parent 76fbb89a03
commit 40ee86b357
2 changed files with 4 additions and 5 deletions

View File

@@ -775,8 +775,7 @@ def test_backtest_start_live(default_conf, mocker, caplog):
def test_backtest_start_multi_strat(default_conf, mocker, caplog):
conf = deepcopy(default_conf)
conf['exchange']['pair_whitelist'] = ['UNITTEST/BTC']
default_conf['exchange']['pair_whitelist'] = ['UNITTEST/BTC']
mocker.patch('freqtrade.exchange.Exchange.get_ticker_history',
new=lambda s, n, i: _load_pair_as_ticks(n, i))
patch_exchange(mocker)
@@ -788,7 +787,7 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog):
mocker.patch('freqtrade.optimize.backtesting.Backtesting._generate_text_table_strategy',
gen_strattable_mock)
mocker.patch('freqtrade.configuration.open', mocker.mock_open(
read_data=json.dumps(conf)
read_data=json.dumps(default_conf)
))
args = [