Make flake happy again

This commit is contained in:
hroff-1902 2019-10-17 23:40:29 +03:00
parent 8564affdf0
commit 2ebddcf45c

View File

@ -1488,31 +1488,32 @@ def test_get_valid_pair_combination(default_conf, mocker, markets):
ex.get_valid_pair_combination("NOPAIR", "ETH") ex.get_valid_pair_combination("NOPAIR", "ETH")
@pytest.mark.parametrize("base_currencies, quote_currencies, pairs_only, active_only," @pytest.mark.parametrize(
"expected_keys", [ "base_currencies, quote_currencies, pairs_only, active_only, expected_keys", [
# Testing markets (in conftest.py): # Testing markets (in conftest.py):
# 'BLK/BTC': 'active': True # 'BLK/BTC': 'active': True
# 'BTT/BTC': 'active': True # 'BTT/BTC': 'active': True
# 'ETH/BTC': 'active': True # 'ETH/BTC': 'active': True
# 'ETH/USDT': 'active': True # 'ETH/USDT': 'active': True
# 'LTC/BTC': 'active': False # 'LTC/BTC': 'active': False
# 'LTC/USD': 'active': True # 'LTC/USD': 'active': True
# 'LTC/USDT': 'active': True # 'LTC/USDT': 'active': True
# 'NEO/BTC': 'active': False # 'NEO/BTC': 'active': False
# 'TKN/BTC': 'active' not set # 'TKN/BTC': 'active' not set
# 'XLTCUSDT': 'active': True, not a pair # 'XLTCUSDT': 'active': True, not a pair
# 'XRP/BTC': 'active': False # 'XRP/BTC': 'active': False
# all markets # all markets
([], [], False, False, ([], [], False, False,
['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/BTC', 'LTC/USD', 'LTC/USDT', 'NEO/BTC', ['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/BTC', 'LTC/USD',
'TKN/BTC', 'XLTCUSDT', 'XRP/BTC']), 'LTC/USDT', 'NEO/BTC', 'TKN/BTC', 'XLTCUSDT', 'XRP/BTC']),
# active markets # active markets
([], [], False, True, ([], [], False, True,
['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/USD', 'LTC/USDT', 'TKN/BTC', 'XLTCUSDT']), ['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/USD', 'LTC/USDT',
'TKN/BTC', 'XLTCUSDT']),
# all pairs # all pairs
([], [], True, False, ([], [], True, False,
['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/BTC', 'LTC/USD', 'LTC/USDT', 'NEO/BTC', ['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/BTC', 'LTC/USD',
'TKN/BTC', 'XRP/BTC']), 'LTC/USDT', 'NEO/BTC', 'TKN/BTC', 'XRP/BTC']),
# active pairs # active pairs
([], [], True, True, ([], [], True, True,
['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/USD', 'LTC/USDT', 'TKN/BTC']), ['BLK/BTC', 'BTT/BTC', 'ETH/BTC', 'ETH/USDT', 'LTC/USD', 'LTC/USDT', 'TKN/BTC']),
@ -1540,7 +1541,7 @@ def test_get_valid_pair_combination(default_conf, mocker, markets):
# all markets, base=LTC, quote=NONEXISTENT # all markets, base=LTC, quote=NONEXISTENT
(['LTC'], ['NONEXISTENT'], False, False, (['LTC'], ['NONEXISTENT'], False, False,
[]), []),
]) ])
def test_get_markets(default_conf, mocker, markets, def test_get_markets(default_conf, mocker, markets,
base_currencies, quote_currencies, pairs_only, active_only, base_currencies, quote_currencies, pairs_only, active_only,
expected_keys): expected_keys):