diff --git a/services/case_service.py b/services/case_service.py index 9d89603d53ac721b7ff828268eaccc628b711bb0..afeafd05499fc11a454e4fc1797e183a45f47c83 100644 --- a/services/case_service.py +++ b/services/case_service.py @@ -122,8 +122,8 @@ async def update_case_content(data, user, case_id): case.pre_condition = data['pre_condition'] if 'steps' in data: case.steps = data['steps'] - if 'test_type' in data: - case.type = data['test_type'] + if 'type' in data: + case.type = data['type'] if 'device_type' in data: case.device_type = data['device_type'] if 'priority' in data: diff --git a/services/plan_service.py b/services/plan_service.py index 606b7c089ea654c6f851fbe0edc73b7c771ffecf..ddfe21907be40700920e8c3e62ed7a455bc15812 100644 --- a/services/plan_service.py +++ b/services/plan_service.py @@ -217,7 +217,9 @@ async def __start_auto_task(auto_tasks): ret, ok = await create_tone_job({ 'task_id': task.id, 'test_config': test_config, - 'job_type': gen_tone_job_type(job_type) + 'job_type': gen_tone_job_type(job_type), + 'workspace': task.workspace, + 'project': task.project }) if not ok: log.logger.info(ret) diff --git a/services/task_service.py b/services/task_service.py index 869efd9669b6cde62b76a8d36b05d3602fa3d0b8..f6c76d5dd80f8c4570adea419ce30ad8c3476a42 100644 --- a/services/task_service.py +++ b/services/task_service.py @@ -64,25 +64,29 @@ async def __gen_run_result_case_infos(case_ids): case_infos = list() cases = await Case.query_obj_all(Case.id.in_(case_ids)) for case in cases: + tmp_case = { + 'id': case.id, + 'name': case.name, + 'tone_case_id': case.tone_case, + 'suite_name': case.suite_name, + 'priority': case.priority, + 'creator': case.creator, + 'type': case.type, + 'run_method': 'manual', + 'result': '', + 'start_time': '', + 'end_time': '', + 'statistics': '' + } if case.tone_case: tone_case_id = int(case.tone_case) tone_case = await ToneCase.query_obj_one(ToneCase.tone_case_id == tone_case_id) - case_infos.append({ - 'id': case.id, - 'name': case.name, - 'tone_case_id': case.tone_case, - 'suite_name': case.suite_name, - 'tone_case_name': tone_case.tone_case_name, - 'tone_suite_name': tone_case.suite_name, - 'priority': case.priority, - 'creator': case.creator, - 'type': case.type, - 'run_method': 'manual', - 'result': '', - 'start_time': '', - 'end_time': '', - 'statistics': '' - }) + if tone_case: + tmp_case.update({ + 'tone_case_name': tone_case.tone_case_name, + 'tone_suite_name': tone_case.suite_name + }) + case_infos.append(tmp_case) return case_infos diff --git a/services/tone_job_service.py b/services/tone_job_service.py index c5e625e83a6202f2c2f28647db4d13016369511e..22f5097152c2b9373332ceb34038f23b0d6e6dff 100644 --- a/services/tone_job_service.py +++ b/services/tone_job_service.py @@ -1,6 +1,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 models.job_model import ToneJob, PerfResult, FuncResult from models.task_model import Task, update_task_status @@ -154,6 +155,7 @@ 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) if status == 200: if result['success']: await create_job(result['data'], data.get('task_id')) diff --git a/views/task_view.py b/views/task_view.py index 5b1bfc22db1f4fb644380094565f77558e5adfe0..beafe626191a41c5e585021f8bc879d696e74d1f 100644 --- a/views/task_view.py +++ b/views/task_view.py @@ -5,7 +5,7 @@ from common.http import rsp from services.auth_service import login_auth, read_auth from services.task_service import get_tasks, get_task_by_id, create_task, remove_task, found_cases, \ modify_task, add_run_result -from views.utils import check_args, ERROR_LACK_ARGS +from views.utils import check_args, ERROR_LACK_ARGS, ERROR_LACK_MANUAL_TASK_CONFIG bp = Blueprint('task', url_prefix='api/task') @@ -35,12 +35,12 @@ async def get_task(_, task_id, user_infos): @bp.post('/create') @read_auth async def create(request, user_infos): - args = ['name', 'plan_id', 'cases', 'run_method', 'workspace', 'project', 'job_type'] + args = ['name', 'cases', 'run_method', 'workspace', 'project', 'job_type'] res, ok = check_args(args, request.json) if not ok: return res if request.json['run_method'] == Task_Run_Method.MANUAL.value and 'config' not in request.json: - return rsp(code=400, msg=ERROR_LACK_ARGS) + return rsp(code=400, msg=ERROR_LACK_MANUAL_TASK_CONFIG) result, ok = await create_task(request.json, user_infos['user_name']) if not ok: return rsp(code=500, msg=result) diff --git a/views/utils.py b/views/utils.py index 173b5273e4d3ab5699075771bcd94ee54e806608..66334208abd2e5d4ae26b8e33b625dca8ed2a11c 100644 --- a/views/utils.py +++ b/views/utils.py @@ -3,6 +3,7 @@ from common.http import rsp ERROR_LACK_ARGS = '缺少相关参数' ERROR_EMPTY_ARG = '参数不为空' ERROR_FAILED_DELETE = '删除失败' +ERROR_LACK_MANUAL_TASK_CONFIG = '缺少手动用例的配置' def check_args(args, request):