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

Improve resiliancy of a test

This commit is contained in:
Matthias 2021-04-07 17:10:20 +02:00
parent c36051be56
commit 4d30c32ad2
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/conftest_trades.py
View File

@ -241,7 +241,8 @@ def mock_trade_5(fee):
open_rate=0.123, open_rate=0.123,
exchange='bittrex', exchange='bittrex',
strategy='SampleStrategy', strategy='SampleStrategy',
stoploss_order_id='prod_stoploss_3455' stoploss_order_id='prod_stoploss_3455',
timeframe=5,
) )
o = Order.parse_from_ccxt_object(mock_order_5(), 'XRP/BTC', 'buy') o = Order.parse_from_ccxt_object(mock_order_5(), 'XRP/BTC', 'buy')
trade.orders.append(o) trade.orders.append(o)
@ -295,6 +296,7 @@ def mock_trade_6(fee):
exchange='bittrex', exchange='bittrex',
strategy='SampleStrategy', strategy='SampleStrategy',
open_order_id="prod_sell_6", open_order_id="prod_sell_6",
timeframe=5,
) )
o = Order.parse_from_ccxt_object(mock_order_6(), 'LTC/BTC', 'buy') o = Order.parse_from_ccxt_object(mock_order_6(), 'LTC/BTC', 'buy')
trade.orders.append(o) trade.orders.append(o)

72
tests/rpc/test_rpc_apiserver.py
View File

@ -753,25 +753,21 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
get_balances=MagicMock(return_value=ticker), get_balances=MagicMock(return_value=ticker),
fetch_ticker=ticker, fetch_ticker=ticker,
get_fee=fee, get_fee=fee,
markets=PropertyMock(return_value=markets) markets=PropertyMock(return_value=markets),
fetch_order=MagicMock(return_value={}),
) )
rc = client_get(client, f"{BASE_URI}/status") rc = client_get(client, f"{BASE_URI}/status")
assert_response(rc, 200) assert_response(rc, 200)
assert rc.json() == [] assert rc.json() == []
create_mock_trades(fee)
ftbot.enter_positions()
trades = Trade.get_open_trades()
trades[0].open_order_id = None
ftbot.exit_positions(trades)
Trade.query.session.flush()
rc = client_get(client, f"{BASE_URI}/status") rc = client_get(client, f"{BASE_URI}/status")
assert_response(rc) assert_response(rc)
assert len(rc.json()) == 1 assert len(rc.json()) == 4
assert rc.json() == [{ assert rc.json()[0] == {
'amount': 91.07468123, 'amount': 123.0,
'amount_requested': 91.07468123, 'amount_requested': 123.0,
'base_currency': 'BTC', 'base_currency': 'BTC',
'close_date': None, 'close_date': None,
'close_date_hum': None, 'close_date_hum': None,
@ -780,37 +776,37 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
'close_profit_pct': None, 'close_profit_pct': None,
'close_profit_abs': None, 'close_profit_abs': None,
'close_rate': None, 'close_rate': None,
'current_profit': -0.00408133, 'current_profit': ANY,
'current_profit_pct': -0.41, 'current_profit_pct': ANY,
'current_profit_abs': -4.09e-06, 'current_profit_abs': ANY,
'profit_ratio': -0.00408133, 'profit_ratio': ANY,
'profit_pct': -0.41, 'profit_pct': ANY,
'profit_abs': -4.09e-06, 'profit_abs': ANY,
'profit_fiat': ANY, 'profit_fiat': ANY,
'current_rate': 1.099e-05, 'current_rate': 1.099e-05,
'open_date': ANY, 'open_date': ANY,
'open_date_hum': 'just now', 'open_date_hum': ANY,
'open_timestamp': ANY, 'open_timestamp': ANY,
'open_order': None, 'open_order': None,
'open_rate': 1.098e-05, 'open_rate': 0.123,
'pair': 'ETH/BTC', 'pair': 'ETH/BTC',
'stake_amount': 0.001, 'stake_amount': 0.001,
'stop_loss_abs': 9.882e-06, 'stop_loss_abs': ANY,
'stop_loss_pct': -10.0, 'stop_loss_pct': ANY,
'stop_loss_ratio': -0.1, 'stop_loss_ratio': ANY,
'stoploss_order_id': None, 'stoploss_order_id': None,
'stoploss_last_update': ANY, 'stoploss_last_update': ANY,
'stoploss_last_update_timestamp': ANY, 'stoploss_last_update_timestamp': ANY,
'initial_stop_loss_abs': 9.882e-06, 'initial_stop_loss_abs': 0.0,
'initial_stop_loss_pct': -10.0, 'initial_stop_loss_pct': ANY,
'initial_stop_loss_ratio': -0.1, 'initial_stop_loss_ratio': ANY,
'stoploss_current_dist': -1.1080000000000002e-06, 'stoploss_current_dist': ANY,
'stoploss_current_dist_ratio': -0.10081893, 'stoploss_current_dist_ratio': ANY,
'stoploss_current_dist_pct': -10.08, 'stoploss_current_dist_pct': ANY,
'stoploss_entry_dist': -0.00010475, 'stoploss_entry_dist': ANY,
'stoploss_entry_dist_ratio': -0.10448878, 'stoploss_entry_dist_ratio': ANY,
'trade_id': 1, 'trade_id': 1,
'close_rate_requested': None, 'close_rate_requested': ANY,
'fee_close': 0.0025, 'fee_close': 0.0025,
'fee_close_cost': None, 'fee_close_cost': None,
'fee_close_currency': None, 'fee_close_currency': None,
@ -818,17 +814,17 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
'fee_open_cost': None, 'fee_open_cost': None,
'fee_open_currency': None, 'fee_open_currency': None,
'is_open': True, 'is_open': True,
'max_rate': 1.099e-05, 'max_rate': ANY,
'min_rate': 1.098e-05, 'min_rate': ANY,
'open_order_id': None, 'open_order_id': 'dry_run_buy_12345',
'open_rate_requested': 1.098e-05, 'open_rate_requested': ANY,
'open_trade_value': 0.0010025, 'open_trade_value': 15.1668225,
'sell_reason': None, 'sell_reason': None,
'sell_order_status': None, 'sell_order_status': None,
'strategy': 'DefaultStrategy', 'strategy': 'DefaultStrategy',
'timeframe': 5, 'timeframe': 5,
'exchange': 'bittrex', 'exchange': 'bittrex',
}] }
mocker.patch('freqtrade.freqtradebot.FreqtradeBot.get_sell_rate', mocker.patch('freqtrade.freqtradebot.FreqtradeBot.get_sell_rate',
MagicMock(side_effect=ExchangeError("Pair 'ETH/BTC' not available"))) MagicMock(side_effect=ExchangeError("Pair 'ETH/BTC' not available")))
@ -836,7 +832,7 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
rc = client_get(client, f"{BASE_URI}/status") rc = client_get(client, f"{BASE_URI}/status")
assert_response(rc) assert_response(rc)
resp_values = rc.json() resp_values = rc.json()
assert len(resp_values) == 1 assert len(resp_values) == 4
assert isnan(resp_values[0]['profit_abs']) assert isnan(resp_values[0]['profit_abs'])