Merge branch 'improvedGraphing' into ObjectivyGraphImprovements

# Conflicts:
#	freqtrade/arguments.py
This commit is contained in:
Gert Wohlgemuth
2018-05-09 05:08:30 -07:00
5 changed files with 358 additions and 33 deletions

View File

@@ -1013,9 +1013,12 @@ def test_count_handle(default_conf, update, ticker, fee, mocker) -> None:
msg_mock.reset_mock()
telegram._count(bot=MagicMock(), update=update)
msg = '<pre> current max\n--------- -----\n 1 {}</pre>'.format(
default_conf['max_open_trades']
)
msg = '<pre> current max total stake\n--------- ----- -------------\n' \
' 1 {} {}</pre>'\
.format(
default_conf['max_open_trades'],
default_conf['stake_amount']
)
assert msg in msg_mock.call_args_list[0][0][0]