mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tests for new background method

Browse Source
This commit is contained in:
Matthias
2023-05-31 07:08:27 +02:00
parent 7bccf2129f
commit fd955028a8
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/rpc/api_server/api_schemas.py
+2
View File
@@ -32,6 +32,8 @@ class BgJobStarted(StatusMsg):
class BackgroundTaskStatus(BaseModel): class BackgroundTaskStatus(BaseModel):
job_id: str
job_category: str
status: str status: str
running: bool running: bool
progress: Optional[float] progress: Optional[float]
freqtrade/rpc/api_server/api_v1.py
+1 -1
View File
@@ -418,7 +418,7 @@ def background_job(jobid: str):
return { return {
'job_id': jobid, 'job_id': jobid,
# 'type': job['job_type'], 'job_category': job['category'],
'status': job['status'], 'status': job['status'],
'running': job['is_running'], 'running': job['is_running'],
'progress': job.get('progress'), 'progress': job.get('progress'),
tests/rpc/test_rpc_apiserver.py
+19 -11
View File
@@ -1643,15 +1643,10 @@ def test_api_pairlists_evaluate(botclient, tmpdir):
ftbot, client = botclient ftbot, client = botclient
ftbot.config['user_data_dir'] = Path(tmpdir) ftbot.config['user_data_dir'] = Path(tmpdir)
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate") rc = client_get(client, f"{BASE_URI}/pairlists/evaluate/randomJob")
assert_response(rc) assert_response(rc, 404)
assert rc.json()['status'] == 'pending' assert rc.json()['detail'] == 'Job not found.'
ApiBG.pairlist_running = True
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate")
assert_response(rc)
assert rc.json()['status'] == 'running'
body = { body = {
"pairlists": [ "pairlists": [
@@ -1662,6 +1657,7 @@ def test_api_pairlists_evaluate(botclient, tmpdir):
"stake_currency": "BTC" "stake_currency": "BTC"
} }
# Fail, already running # Fail, already running
ApiBG.pairlist_running = True
rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body) rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body)
assert_response(rc, 400) assert_response(rc, 400)
assert rc.json()['detail'] == 'Pairlist evaluation is already running.' assert rc.json()['detail'] == 'Pairlist evaluation is already running.'
@@ -1671,8 +1667,19 @@ def test_api_pairlists_evaluate(botclient, tmpdir):
rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body) rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body)
assert_response(rc) assert_response(rc)
assert rc.json()['status'] == 'Pairlist evaluation started in background.' assert rc.json()['status'] == 'Pairlist evaluation started in background.'
job_id = rc.json()['job_id']
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate") rc = client_get(client, f"{BASE_URI}/background/RandomJob")
assert_response(rc, 404)
assert rc.json()['detail'] == 'Job not found.'
rc = client_get(client, f"{BASE_URI}/background/{job_id}")
assert_response(rc)
response = rc.json()
assert response['job_id'] == job_id
assert response['job_category'] == 'pairlist'
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate/{job_id}")
assert_response(rc) assert_response(rc)
response = rc.json() response = rc.json()
assert response['result']['whitelist'] == ['ETH/BTC', 'LTC/BTC', 'XRP/BTC', 'NEO/BTC',] assert response['result']['whitelist'] == ['ETH/BTC', 'LTC/BTC', 'XRP/BTC', 'NEO/BTC',]
@@ -1683,8 +1690,9 @@ def test_api_pairlists_evaluate(botclient, tmpdir):
rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body) rc = client_post(client, f"{BASE_URI}/pairlists/evaluate", body)
assert_response(rc) assert_response(rc)
assert rc.json()['status'] == 'Pairlist evaluation started in background.' assert rc.json()['status'] == 'Pairlist evaluation started in background.'
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate") job_id = rc.json()['job_id']
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate")
rc = client_get(client, f"{BASE_URI}/pairlists/evaluate/{job_id}")
assert_response(rc) assert_response(rc)
response = rc.json() response = rc.json()
assert response['result']['whitelist'] == ['ETH/BTC', 'LTC/BTC', ] assert response['result']['whitelist'] == ['ETH/BTC', 'LTC/BTC', ]