From de65a36c5acba1347e97f4d00b9650b1e0537e1a Mon Sep 17 00:00:00 2001 From: youhuo Date: Wed, 24 Aug 2022 19:30:40 +0800 Subject: [PATCH] fix: tone return parameters --- services/tone_job_service.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/services/tone_job_service.py b/services/tone_job_service.py index cb254df..7443743 100644 --- a/services/tone_job_service.py +++ b/services/tone_job_service.py @@ -2,7 +2,7 @@ import time from app.conf import conf from app.log import log -from common.enums import Tone_Job_State, Track_Result, Case_Result, Status_EN +from common.enums import Tone_Job_State, Track_Result, Case_Result, Status_EN, Test_Type from models.job_model import ToneJob, PerfResult, FuncResult from models.task_model import Task, update_task_status from models.plan_model import update_plan_status @@ -12,13 +12,24 @@ from common.tone.api import TONE_JOB_QUERY, TONE_CREATE_JOB async def create_job(data, task_id): - tone_job = {'name': data.get('job_name'), 'state': Tone_Job_State.PENDING.value, - 'test_type': data.get('test_type'), 'tone_job_id': data.get('job_id'), 'task_id': task_id} + tone_job = { + 'name': data.get('name'), + 'state': Tone_Job_State.PENDING.value, + 'test_type': __transfer_job_type(data.get('test_type')), + 'tone_job_id': data.get('id'), + 'task_id': task_id + } result = await ToneJob().save(tone_job) await update_task_status(Status_EN.RUNNING.value, task_id) return result.to_dict(), True +def __transfer_job_type(test_type): + if test_type == '性能测试' or test_type == Test_Type.PERFORMANCE.value: + return Test_Type.PERFORMANCE.value + return Test_Type.FUNCTIONAL.value + + async def update_job(data, is_finished): tone_job = await ToneJob.query_obj_one(ToneJob.tone_job_id == data.get('job_id')) if not tone_job: @@ -155,11 +166,10 @@ async def create_tone_job(data): 'callback_api': conf.config['MAIN_DOMAIN'] + 'api/tone/callback' } status, result = await get_res_from_tone('post', TONE_CREATE_JOB, req_data) - log.logger.info("Create tone job params:", req_data) + log.logger.info(f"Create tone job params:{req_data}") if status == 200: + log.logger.debug(result) if result['success']: - if 'job_name' not in result['data']: - result['data']['job_name'] = req_data['name'] await create_job(result['data'], data.get('task_id')) return None, True else: -- Gitee