Merge pull request #284 from jblestang/fix_issue_283

fixing the sorting issue in MarketSummary when using --dynamic-whitelist (issue #283)

freqtrade/tests/test_acl_pair.py

@@ -16,24 +16,43 @@ def whitelist_conf():
                 "BTC_SWT",
                 "BTC_BCC"
             ],
+            "pair_blacklist": [
+                "BTC_BLK"
+            ],
         },
     }
 
 
 def get_health():
     return [{'Currency': 'ETH',
-             'IsActive': True
+             'IsActive': True,
+             'BaseVolume': 42
              },
             {'Currency': 'TKN',
-             'IsActive': True
-             }]
+             'IsActive': True,
+             'BaseVolume': 1664
+             },
+            {'Currency': 'BLK',
+             'IsActive': True,
+             'BaseVolume': 4096
+             }
+            ]
 
 
 def get_health_empty():
     return []
 
-# below three test could be merged into a single
-# test that ran randomlly generated health lists
+
+def test_refresh_market_pair_not_in_whitelist(mocker):
+    conf = whitelist_conf()
+    mocker.patch.dict('freqtrade.main._CONF', conf)
+    mocker.patch.multiple('freqtrade.main.exchange',
+                          get_wallet_health=get_health)
+    refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist'] + ['BTC_XXX'])
+    # List ordered by BaseVolume
+    whitelist = ['BTC_ETH', 'BTC_TKN']
+    # Ensure all except those in whitelist are removed
+    assert whitelist == refreshedwhitelist
 
 
 def test_refresh_whitelist(mocker):
@@ -42,9 +61,10 @@ def test_refresh_whitelist(mocker):
     mocker.patch.multiple('freqtrade.main.exchange',
                           get_wallet_health=get_health)
     refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist'])
+    # List ordered by BaseVolume
     whitelist = ['BTC_ETH', 'BTC_TKN']
     # Ensure all except those in whitelist are removed
-    assert set(whitelist) == set(refreshedwhitelist)
+    assert whitelist == refreshedwhitelist
 
 
 def test_refresh_whitelist_dynamic(mocker):
@@ -53,9 +73,9 @@ def test_refresh_whitelist_dynamic(mocker):
     mocker.patch.multiple('freqtrade.main.exchange',
                           get_wallet_health=get_health)
     # argument: use the whitelist dynamically by exchange-volume
-    whitelist = ['BTC_ETH', 'BTC_TKN']
+    whitelist = ['BTC_TKN', 'BTC_ETH']
     refreshedwhitelist = refresh_whitelist(whitelist)
-    assert set(whitelist) == set(refreshedwhitelist)
+    assert whitelist == refreshedwhitelist
 
 
 def test_refresh_whitelist_dynamic_empty(mocker):