Merge branch 'develop' into no-ticker-2

tests/commands/test_commands.py

@@ -902,6 +902,21 @@ def test_hyperopt_list(mocker, capsys, hyperopt_results):
     assert all(x not in captured.out
                for x in [" 1/12", " 3/12", " 4/12", " 5/12", " 7/12", " 8/12"
                          " 9/12", " 10/12", " 11/12", " 12/12"])
+    args = [
+        "hyperopt-list",
+        "--no-details",
+        "--export-csv", "test_file.csv"
+    ]
+    pargs = get_args(args)
+    pargs['config'] = None
+    start_hyperopt_list(pargs)
+    captured = capsys.readouterr()
+    assert all(x in captured.out
+               for x in ["CSV-File created!"])
+    f = Path("test_file.csv")
+    assert 'Best,1,2,-1.25%,-0.00125625,,-2.51,"3,930.0 m",0.43662' in f.read_text()
+    assert f.is_file()
+    f.unlink()
 
 
 def test_hyperopt_show(mocker, capsys, hyperopt_results):

tests/optimize/test_backtesting.py

@@ -241,7 +241,7 @@ def test_setup_optimize_configuration_unlimited_stake_amount(mocker, default_con
         '--strategy', 'DefaultStrategy',
     ]
 
-    with pytest.raises(DependencyException, match=r'.*stake amount.*'):
+    with pytest.raises(DependencyException, match=r'.`stake_amount`.*'):
         setup_optimize_configuration(get_args(args), RunMode.BACKTEST)
 
 

tests/optimize/test_hyperopt.py

@@ -10,10 +10,11 @@ import pytest
 from arrow import Arrow
 from filelock import Timeout
 
+from freqtrade import constants
 from freqtrade.commands.optimize_commands import (setup_optimize_configuration,
                                                   start_hyperopt)
 from freqtrade.data.history import load_data
-from freqtrade.exceptions import OperationalException
+from freqtrade.exceptions import DependencyException, OperationalException
 from freqtrade.optimize.default_hyperopt import DefaultHyperOpt
 from freqtrade.optimize.default_hyperopt_loss import DefaultHyperOptLoss
 from freqtrade.optimize.hyperopt import Hyperopt
@@ -158,6 +159,21 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo
     assert log_has('Parameter --print-all detected ...', caplog)
 
 
+def test_setup_hyperopt_configuration_unlimited_stake_amount(mocker, default_conf, caplog) -> None:
+    default_conf['stake_amount'] = constants.UNLIMITED_STAKE_AMOUNT
+
+    patched_configuration_load_config_file(mocker, default_conf)
+
+    args = [
+        'hyperopt',
+        '--config', 'config.json',
+        '--hyperopt', 'DefaultHyperOpt',
+    ]
+
+    with pytest.raises(DependencyException, match=r'.`stake_amount`.*'):
+        setup_optimize_configuration(get_args(args), RunMode.HYPEROPT)
+
+
 def test_hyperoptresolver(mocker, default_conf, caplog) -> None:
     patched_configuration_load_config_file(mocker, default_conf)
 

tests/pairlist/test_pairlist.py

@@ -240,8 +240,6 @@ def test_pairlist_class(mocker, whitelist_conf, markets, pairlist):
     (['ETH/BTC', 'TKN/BTC', 'ETH/USDT'], "is not compatible with your stake currency"),
     # BCH/BTC not available
     (['ETH/BTC', 'TKN/BTC', 'BCH/BTC'], "is not compatible with exchange"),
-    # BLK/BTC in blacklist
-    (['ETH/BTC', 'TKN/BTC', 'BLK/BTC'], "in your blacklist. Removing "),
     # BTT/BTC is inactive
     (['ETH/BTC', 'TKN/BTC', 'BTT/BTC'], "Market is not active")
 ])