Merge branch 'additionalColumnForStatusTable' into develop-berlinguyinca

# Conflicts:
#	freqtrade/tests/rpc/test_rpc.py
This commit is contained in:
Gert Wohlgemuth 2018-05-02 20:43:09 -07:00
commit 15b3de0ce9

View File

@ -99,7 +99,6 @@ def test_rpc_status_table(default_conf, ticker, mocker) -> None:
assert error assert error
assert '*Status:* `no active order`' in result assert '*Status:* `no active order`' in result
print(result)
freqtradebot.create_trade() freqtradebot.create_trade()
(error, result) = rpc.rpc_status_table() (error, result) = rpc.rpc_status_table()
assert 'just now' in result['Since'].all() assert 'just now' in result['Since'].all()
@ -107,6 +106,7 @@ def test_rpc_status_table(default_conf, ticker, mocker) -> None:
assert '-0.59%' in result['Profit'].all() assert '-0.59%' in result['Profit'].all()
assert 'Value' in result assert 'Value' in result
def test_rpc_daily_profit(default_conf, update, ticker, limit_buy_order, limit_sell_order, mocker)\ def test_rpc_daily_profit(default_conf, update, ticker, limit_buy_order, limit_sell_order, mocker)\
-> None: -> None:
""" """