Merge branch 'develop' into fix/backtest_toomanyopen

2018-11-24 10:38:30 +01:00
parent 59cd4fe0ef e4d9d72ff1
commit 805f509498
47 changed files with 2615 additions and 301 deletions
--- a/freqtrade/tests/optimize/test_backtesting.py
+++ b/freqtrade/tests/optimize/test_backtesting.py
@@ -638,6 +638,7 @@ def test_backtest_only_sell(mocker, default_conf):

 def test_backtest_alternate_buy_sell(default_conf, fee, mocker):
    mocker.patch('freqtrade.exchange.Exchange.get_fee', fee)
+    mocker.patch('freqtrade.optimize.backtesting.file_dump_json', MagicMock())
    backtest_conf = _make_backtest_conf(mocker, conf=default_conf, pair='UNITTEST/BTC')
    # We need to enable sell-signal - otherwise it sells on ROI!!
    default_conf['experimental'] = {"use_sell_signal": True}