From ffdb5fb790de8bdf59c76170d7723e0de9fb0740 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 24 Aug 2023 18:06:17 +0200 Subject: [PATCH] Fix further tests after conftest_trades rework --- tests/rpc/test_rpc_apiserver.py | 8 ++++---- tests/rpc/test_rpc_telegram.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index 8810cfc2c..a85d15365 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -841,7 +841,7 @@ def test_api_edge_disabled(botclient, mocker, ticker, fee, markets): 'profit_closed_percent_sum': -1.5, 'profit_closed_ratio': -6.739057628404269e-06, 'profit_closed_percent': -0.0, 'winning_trades': 0, 'losing_trades': 2, 'profit_factor': 0.0, 'winrate': 0.0, 'expectancy': -0.0033695635, - 'expectancy_ratio': -1.0, 'trading_volume': 91.074, + 'expectancy_ratio': -1.0, 'trading_volume': 75.945, } ), ( @@ -857,7 +857,7 @@ def test_api_edge_disabled(botclient, mocker, ticker, fee, markets): 'profit_closed_percent_sum': 1.5, 'profit_closed_ratio': 7.391275897987988e-07, 'profit_closed_percent': 0.0, 'winning_trades': 2, 'losing_trades': 0, 'profit_factor': None, 'winrate': 1.0, 'expectancy': 0.0003695635, - 'expectancy_ratio': 100, 'trading_volume': 91.074, + 'expectancy_ratio': 100, 'trading_volume': 75.945, } ), ( @@ -874,7 +874,7 @@ def test_api_edge_disabled(botclient, mocker, ticker, fee, markets): 'profit_closed_percent': -0.0, 'winning_trades': 1, 'losing_trades': 1, 'profit_factor': 0.02775724835771106, 'winrate': 0.5, 'expectancy': -0.0027145635000000003, 'expectancy_ratio': -0.48612137582114445, - 'trading_volume': 91.074, + 'trading_volume': 75.945, } ) ]) @@ -1125,7 +1125,7 @@ def test_api_status(botclient, mocker, ticker, fee, markets, is_short, assert_response(rc) resp_values = rc.json() assert len(resp_values) == 4 - assert resp_values[0]['profit_abs'] is None + assert resp_values[0]['profit_abs'] == 0.0 def test_api_version(botclient): diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index 72d70bfb9..899bef20e 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -316,7 +316,7 @@ async def test_telegram_status_multi_entry(default_conf, update, mocker, fee) -> create_mock_trades(fee) trades = Trade.get_open_trades() - trade = trades[0] + trade = trades[3] # Average may be empty on some exchanges trade.orders[0].average = 0 trade.orders.append(Order( @@ -344,9 +344,9 @@ async def test_telegram_status_multi_entry(default_conf, update, mocker, fee) -> await telegram._status(update=update, context=MagicMock()) assert msg_mock.call_count == 4 - msg = msg_mock.call_args_list[0][0][0] + msg = msg_mock.call_args_list[3][0][0] assert re.search(r'Number of Entries.*2', msg) - assert re.search(r'Number of Exits.*0', msg) + assert re.search(r'Number of Exits.*1', msg) assert re.search(r'Average Entry Price', msg) assert re.search(r'Order filled', msg) assert re.search(r'Close Date:', msg) is None