From 08c3ff65cd182ccfd8cc1727fdf22517f9d911dc Mon Sep 17 00:00:00 2001
From: Gert Wohlgemuth <wohlgemuth@ucdavis.edu>
Date: Mon, 16 Jul 2018 21:22:59 -0700
Subject: [PATCH] more test fixes

---
 freqtrade/optimize/hyperopt.py            | 6 ++++--
 freqtrade/tests/optimize/test_hyperopt.py | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt.py
index 41bf8f594..0681239a5 100644
--- a/freqtrade/optimize/hyperopt.py
+++ b/freqtrade/optimize/hyperopt.py
@@ -40,6 +40,7 @@ class Hyperopt(Backtesting):
     hyperopt = Hyperopt(config)
     hyperopt.start()
     """
+
     def __init__(self, config: Dict[str, Any]) -> None:
         super().__init__(config)
         # set TARGET_TRADES to suit your number concurrent trades so its realistic
@@ -75,7 +76,7 @@ class Hyperopt(Backtesting):
         return arg_dict
 
     @staticmethod
-    def populate_indicators(dataframe: DataFrame, pair:str) -> DataFrame:
+    def populate_indicators(dataframe: DataFrame, pair: str) -> DataFrame:
         dataframe['adx'] = ta.ADX(dataframe)
         macd = ta.MACD(dataframe)
         dataframe['macd'] = macd['macd']
@@ -228,6 +229,7 @@ class Hyperopt(Backtesting):
         """
         Define the buy strategy parameters to be used by hyperopt
         """
+
         def populate_buy_trend(dataframe: DataFrame) -> DataFrame:
             """
             Buy strategy Hyperopt will build and use
@@ -360,7 +362,7 @@ class Hyperopt(Backtesting):
         logger.info(f'Found {cpus} CPU cores. Let\'s make them scream!')
 
         opt = self.get_optimizer(cpus)
-        EVALS = max(self.total_tries//cpus, 1)
+        EVALS = max(self.total_tries // cpus, 1)
         try:
             with Parallel(n_jobs=cpus) as parallel:
                 for i in range(EVALS):
diff --git a/freqtrade/tests/optimize/test_hyperopt.py b/freqtrade/tests/optimize/test_hyperopt.py
index 72a102c22..c070abcd2 100644
--- a/freqtrade/tests/optimize/test_hyperopt.py
+++ b/freqtrade/tests/optimize/test_hyperopt.py
@@ -123,7 +123,7 @@ def test_log_results_if_loss_improves(init_hyperopt, capsys) -> None:
         }
     )
     out, err = capsys.readouterr()
-    assert '    1/2: foo. Loss 1.00000'in out
+    assert '    1/2: foo. Loss 1.00000' in out
 
 
 def test_no_log_if_loss_does_not_improve(init_hyperopt, caplog) -> None:
@@ -259,7 +259,7 @@ def test_populate_indicators(init_hyperopt) -> None:
     tick = load_tickerdata_file(None, 'UNITTEST/BTC', '1m')
     tickerlist = {'UNITTEST/BTC': tick}
     dataframes = _HYPEROPT.tickerdata_to_dataframe(tickerlist)
-    dataframe = _HYPEROPT.populate_indicators(dataframes['UNITTEST/BTC'])
+    dataframe = _HYPEROPT.populate_indicators(dataframes['UNITTEST/BTC'], 'UNITTEST/BTC')
 
     # Check if some indicators are generated. We will not test all of them
     assert 'adx' in dataframe
@@ -274,7 +274,7 @@ def test_buy_strategy_generator(init_hyperopt) -> None:
     tick = load_tickerdata_file(None, 'UNITTEST/BTC', '1m')
     tickerlist = {'UNITTEST/BTC': tick}
     dataframes = _HYPEROPT.tickerdata_to_dataframe(tickerlist)
-    dataframe = _HYPEROPT.populate_indicators(dataframes['UNITTEST/BTC'])
+    dataframe = _HYPEROPT.populate_indicators(dataframes['UNITTEST/BTC'], 'UNITTEST/BTC')
 
     populate_buy_trend = _HYPEROPT.buy_strategy_generator(
         {