Merge branch 'develop' into pr/theluxaz/5710

tests/optimize/test_backtesting.py

@@ -1104,6 +1104,7 @@ def test_backtest_start_multi_strat_nomock(default_conf, mocker, caplog, testdat
         '--timerange', '1510694220-1510700340',
         '--enable-position-stacking',
         '--disable-max-market-positions',
+        '--breakdown', 'day',
         '--strategy-list',
         'StrategyTestV2',
         'TestStrategyLegacyV1',
@@ -1132,6 +1133,7 @@ def test_backtest_start_multi_strat_nomock(default_conf, mocker, caplog, testdat
     captured = capsys.readouterr()
     assert 'BACKTESTING REPORT' in captured.out
     assert 'SELL REASON STATS' in captured.out
+    assert 'DAY BREAKDOWN' in captured.out
     assert 'LEFT OPEN TRADES REPORT' in captured.out
     assert '2017-11-14 21:17:00 -> 2017-11-14 22:58:00 | Max open trades : 1' in captured.out
     assert 'STRATEGY SUMMARY' in captured.out

tests/optimize/test_optimize_reports.py

@@ -13,8 +13,10 @@ from freqtrade.data import history
 from freqtrade.data.btanalysis import get_latest_backtest_filename, load_backtest_data
 from freqtrade.edge import PairInfo
 from freqtrade.enums import SellType
-from freqtrade.optimize.optimize_reports import (generate_backtest_stats, generate_daily_stats,
-                                                 generate_edge_table, generate_pair_metrics,
+from freqtrade.optimize.optimize_reports import (_get_resample_from_period, generate_backtest_stats,
+                                                 generate_daily_stats, generate_edge_table,
+                                                 generate_pair_metrics,
+                                                 generate_periodic_breakdown_stats,
                                                  generate_sell_reason_stats,
                                                  generate_strategy_comparison,
                                                  generate_trading_stats, store_backtest_stats,
@@ -377,3 +379,31 @@ def test_generate_edge_table():
     assert generate_edge_table(results).count('| ETH/BTC |') == 1
     assert generate_edge_table(results).count(
         '|   Risk Reward Ratio |   Required Risk Reward |   Expectancy |') == 1
+
+
+def test_generate_periodic_breakdown_stats(testdatadir):
+    filename = testdatadir / "backtest-result_new.json"
+    bt_data = load_backtest_data(filename).to_dict(orient='records')
+
+    res = generate_periodic_breakdown_stats(bt_data, 'day')
+    assert isinstance(res, list)
+    assert len(res) == 21
+    day = res[0]
+    assert 'date' in day
+    assert 'draws' in day
+    assert 'loses' in day
+    assert 'wins' in day
+    assert 'profit_abs' in day
+
+    # Select empty dataframe!
+    res = generate_periodic_breakdown_stats([], 'day')
+    assert res == []
+
+
+def test__get_resample_from_period():
+
+    assert _get_resample_from_period('day') == '1d'
+    assert _get_resample_from_period('week') == '1w'
+    assert _get_resample_from_period('month') == '1M'
+    with pytest.raises(ValueError, match=r"Period noooo is not supported."):
+        _get_resample_from_period('noooo')

tests/plugins/test_pairlist.py

@@ -415,10 +415,10 @@ def test_VolumePairList_refresh_empty(mocker, markets_empty, whitelist_conf):
     # SpreadFilter only
     ([{"method": "SpreadFilter", "max_spread_ratio": 0.005}],
      "BTC", 'filter_at_the_beginning'),  # OperationalException expected
-    # Static Pairlist after VolumePairList, on a non-first position
-    ([{"method": "VolumePairList", "number_assets": 5, "sort_key": "quoteVolume"},
+    # Static Pairlist after VolumePairList, on a non-first position (appends pairs)
+    ([{"method": "VolumePairList", "number_assets": 2, "sort_key": "quoteVolume"},
       {"method": "StaticPairList"}],
-        "BTC", 'static_in_the_middle'),
+        "BTC", ['ETH/BTC', 'TKN/BTC', 'TRST/BTC', 'SWT/BTC', 'BCC/BTC', 'HOT/BTC']),
     ([{"method": "VolumePairList", "number_assets": 20, "sort_key": "quoteVolume"},
       {"method": "PriceFilter", "low_price_ratio": 0.02}],
         "USDT", ['ETH/USDT', 'NANO/USDT']),
@@ -469,13 +469,6 @@ def test_VolumePairList_whitelist_gen(mocker, whitelist_conf, shitcoinmarkets, t
 
     mocker.patch('freqtrade.exchange.Exchange.exchange_has', MagicMock(return_value=True))
 
-    if whitelist_result == 'static_in_the_middle':
-        with pytest.raises(OperationalException,
-                           match=r"StaticPairList can only be used in the first position "
-                                 r"in the list of Pairlist Handlers."):
-            freqtrade = get_patched_freqtradebot(mocker, whitelist_conf)
-        return
-
     freqtrade = get_patched_freqtradebot(mocker, whitelist_conf)
     mocker.patch.multiple('freqtrade.exchange.Exchange',
                           get_tickers=tickers,