adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into add_trades_count_in_performance

Browse Source
This commit is contained in:
Jean-Baptiste LE STANG
2018-01-03 00:06:56 +01:00
parent fbb19e451d f4ccd4609b
commit 01b49dc502
4 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/tests/optimize/test_backtesting.py
View File

@@ -18,11 +18,12 @@ def test_generate_text_table():
'duration': [10, 30]
}
)
print(generate_text_table({'BTC_ETH': {}}, results, 'BTC', 5))
assert generate_text_table({'BTC_ETH': {}}, results, 'BTC', 5) == (
'pair buy count avg profit total profit avg duration\n'
'------- ----------- ------------ -------------- --------------\n'
'BTC_ETH 2 15.00% 0.60000000 BTC 100\n'
'TOTAL 2 15.00% 0.60000000 BTC 100')
'pair buy count avg profit % total profit BTC avg duration\n'
'------- ----------- -------------- ------------------ --------------\n'
'BTC_ETH 2 15.00 0.60000000 100.0\n'
'TOTAL 2 15.00 0.60000000 100.0')
def test_get_timeframe():

36
freqtrade/tests/test_acl_pair.py
View File

@@ -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):