Merge branch 'develop' into data_handler

tests/strategy/failing_strategy.py

@@ -0,0 +1,9 @@
+# The strategy which fails to load due to non-existent dependency
+
+import nonexiting_module  # noqa
+
+from freqtrade.strategy.interface import IStrategy
+
+
+class TestStrategyLegacy(IStrategy):
+    pass

tests/strategy/test_interface.py

@@ -9,8 +9,9 @@ from pandas import DataFrame
 from freqtrade.configuration import TimeRange
 from freqtrade.data.history import load_data
 from freqtrade.persistence import Trade
-from tests.conftest import get_patched_exchange, log_has
+from freqtrade.resolvers import StrategyResolver
 from freqtrade.strategy.default_strategy import DefaultStrategy
+from tests.conftest import get_patched_exchange, log_has
 
 # Avoid to reinit the same object again and again
 _STRATEGY = DefaultStrategy(config={})
@@ -103,7 +104,8 @@ def test_get_signal_handles_exceptions(mocker, default_conf):
 
 
 def test_tickerdata_to_dataframe(default_conf, testdatadir) -> None:
-    strategy = DefaultStrategy(default_conf)
+    default_conf.update({'strategy': 'DefaultStrategy'})
+    strategy = StrategyResolver.load_strategy(default_conf)
 
     timerange = TimeRange.parse_timerange('1510694220-1510700340')
     tickerlist = load_data(testdatadir, '1m', ['UNITTEST/BTC'], timerange=timerange,
@@ -118,7 +120,8 @@ def test_min_roi_reached(default_conf, fee) -> None:
     min_roi_list = [{20: 0.05, 55: 0.01, 0: 0.1},
                     {0: 0.1, 20: 0.05, 55: 0.01}]
     for roi in min_roi_list:
-        strategy = DefaultStrategy(default_conf)
+        default_conf.update({'strategy': 'DefaultStrategy'})
+        strategy = StrategyResolver.load_strategy(default_conf)
         strategy.minimal_roi = roi
         trade = Trade(
             pair='ETH/BTC',
@@ -156,7 +159,8 @@ def test_min_roi_reached2(default_conf, fee) -> None:
                      },
                     ]
     for roi in min_roi_list:
-        strategy = DefaultStrategy(default_conf)
+        default_conf.update({'strategy': 'DefaultStrategy'})
+        strategy = StrategyResolver.load_strategy(default_conf)
         strategy.minimal_roi = roi
         trade = Trade(
             pair='ETH/BTC',
@@ -190,7 +194,8 @@ def test_min_roi_reached3(default_conf, fee) -> None:
                30: 0.05,
                55: 0.30,
                }
-    strategy = DefaultStrategy(default_conf)
+    default_conf.update({'strategy': 'DefaultStrategy'})
+    strategy = StrategyResolver.load_strategy(default_conf)
     strategy.minimal_roi = min_roi
     trade = Trade(
             pair='ETH/BTC',
@@ -290,7 +295,8 @@ def test__analyze_ticker_internal_skip_analyze(ticker_history, mocker, caplog) -
 
 
 def test_is_pair_locked(default_conf):
-    strategy = DefaultStrategy(default_conf)
+    default_conf.update({'strategy': 'DefaultStrategy'})
+    strategy = StrategyResolver.load_strategy(default_conf)
     # dict should be empty
     assert not strategy._pair_locked_until
 

tests/strategy/test_strategy.py

@@ -30,14 +30,25 @@ def test_search_strategy():
     assert s is None
 
 
-def test_search_all_strategies():
+def test_search_all_strategies_no_failed():
     directory = Path(__file__).parent
-    strategies = StrategyResolver.search_all_objects(directory)
+    strategies = StrategyResolver.search_all_objects(directory, enum_failed=False)
     assert isinstance(strategies, list)
     assert len(strategies) == 3
     assert isinstance(strategies[0], dict)
 
 
+def test_search_all_strategies_with_failed():
+    directory = Path(__file__).parent
+    strategies = StrategyResolver.search_all_objects(directory, enum_failed=True)
+    assert isinstance(strategies, list)
+    assert len(strategies) == 4
+    # with enum_failed=True search_all_objects() shall find 3 good strategies
+    # and 1 which fails to load
+    assert len([x for x in strategies if x['class'] is not None]) == 3
+    assert len([x for x in strategies if x['class'] is None]) == 1
+
+
 def test_load_strategy(default_conf, result):
     default_conf.update({'strategy': 'SampleStrategy',
                          'strategy_path': str(Path(__file__).parents[2] / 'freqtrade/templates')