From 76536af55245ebbeb75ba5a146136362bc210049 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste LE STANG Date: Fri, 29 Dec 2017 22:44:16 +0100 Subject: [PATCH] Fixing newly added unit tests in develop --- freqtrade/main.py | 4 ++-- freqtrade/tests/test_acl_pair.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/freqtrade/main.py b/freqtrade/main.py index 1613f0ef8..7a71ca414 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -32,11 +32,11 @@ def refresh_whitelist(whitelist: List[str]) -> List[str]: :param whitelist: a new whitelist (optional) :return: None """ - sanitized_whitelist = [x for x in whitelist if x not in _CONF['exchange'].get('pair_blacklist',[])] + sanitized_whitelist = [] health = exchange.get_wallet_health() for status in health: pair = '{}_{}'.format(_CONF['stake_currency'], status['Currency']) - if pair not in whitelist: + if pair not in whitelist or pair in _CONF['exchange'].get('pair_blacklist',[]): continue if status['IsActive']: sanitized_whitelist.append(pair) diff --git a/freqtrade/tests/test_acl_pair.py b/freqtrade/tests/test_acl_pair.py index 8748d97b8..33bfa7d0e 100644 --- a/freqtrade/tests/test_acl_pair.py +++ b/freqtrade/tests/test_acl_pair.py @@ -48,12 +48,13 @@ def test_refresh_whitelist(mocker): mocker.patch.dict('freqtrade.main._CONF', conf) mocker.patch.multiple('freqtrade.main.exchange', get_wallet_health=get_health) - # no argument: use the whitelist provided by config - refresh_whitelist() + refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist']) + print(conf['exchange']['pair_whitelist']) + print(refreshedwhitelist) whitelist = ['BTC_ETH', 'BTC_TKN'] pairslist = conf['exchange']['pair_whitelist'] # Ensure all except those in whitelist are removed - assert_list_equal(whitelist, pairslist) + assert_list_equal(whitelist, refreshedwhitelist) def test_refresh_whitelist_dynamic(mocker): @@ -63,9 +64,8 @@ def test_refresh_whitelist_dynamic(mocker): get_wallet_health=get_health) # argument: use the whitelist dynamically by exchange-volume whitelist = ['BTC_ETH', 'BTC_TKN'] - refresh_whitelist(whitelist) - pairslist = conf['exchange']['pair_whitelist'] - assert_list_equal(whitelist, pairslist) + refreshedwhitelist = refresh_whitelist(whitelist) + assert_list_equal(whitelist, refreshedwhitelist) def test_refresh_whitelist_dynamic_empty(mocker):