From c55ac6c3815a1ac18de6dcbcc201e490e14f2113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=9B=E9=B9=8F?= <729164035@qq.com> Date: Thu, 1 Aug 2024 16:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E8=B0=83=E5=BC=8F?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E7=9A=84bug=E5=92=8C=E5=BD=95?= =?UTF-8?q?=E5=88=B6bug=EF=BC=9B=E4=BC=98=E5=8C=96=E4=BA=86=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MangoActuator/requirements.txt | 2 +- .../PyAutoTest/auto_test/auto_ui/views/ui_config.py | 13 +++++++------ MangoServer/PyAutoTest/tools/decorator/retry.py | 3 ++- MangoServer/PyAutoTest/tools/view/response_msg.py | 1 + mango-console/src/api/uitest/index.ts | 7 +++++-- mango-console/src/views/apitest/info/index.vue | 2 +- mango-console/src/views/uitest/equipment/index.vue | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/MangoActuator/requirements.txt b/MangoActuator/requirements.txt index 7e7f7f4d..c8a88c8d 100644 --- a/MangoActuator/requirements.txt +++ b/MangoActuator/requirements.txt @@ -26,6 +26,6 @@ blinker==1.7.0 retrying==1.3.4 Pympler==1.0.1 -adbutils==2.4.1 +adbutils==2.7.0 locust==2.27.0 gevent==24.2.1 \ No newline at end of file diff --git a/MangoServer/PyAutoTest/auto_test/auto_ui/views/ui_config.py b/MangoServer/PyAutoTest/auto_test/auto_ui/views/ui_config.py index 29d046cc..a124275b 100644 --- a/MangoServer/PyAutoTest/auto_test/auto_ui/views/ui_config.py +++ b/MangoServer/PyAutoTest/auto_test/auto_ui/views/ui_config.py @@ -101,16 +101,17 @@ class UiConfigViews(ViewSet): config_obj = UiConfig.objects.get(user_id=request.user['id'], status=StatusEnum.SUCCESS.value, type=DriveTypeEnum.WEB.value) - if user_obj.selected_environment is not None and user_obj.selected_environment != 0: + if user_obj.selected_environment is None: return ResponseData.fail(RESPONSE_MSG_0058, ) + if user_obj.selected_project is None: + return ResponseData.fail(RESPONSE_MSG_0120, ) - test_object = TestObject.objects.get(id=user_obj.selected_environment) - project_id = test_object.project_product.project.id host_list = list(TestObject.objects .filter(project_product_id__in=ProjectProduct .objects - .filter(project_id=project_id, - client_type=ProductTypeEnum.WEB.value).values_list('id')) + .filter(project_id=user_obj.selected_project, + client_type=ProductTypeEnum.WEB.value).values_list('id'), + environment=user_obj.selected_environment) .values_list('value', flat=True)) host_list = [urllib.parse.urlparse(url).netloc for url in process_urls(host_list)] web_config = WEBConfigModel(browser_type=config_obj.browser_type, @@ -119,7 +120,7 @@ class UiConfigViews(ViewSet): is_headless=config_obj.is_headless, device=config_obj.device, is_header_intercept=True, - project_product=test_object.project_product_id, + project_product=user_obj.selected_project, host_list=host_list) else: config_obj = self.model.objects.get(id=request.query_params.get('id')) diff --git a/MangoServer/PyAutoTest/tools/decorator/retry.py b/MangoServer/PyAutoTest/tools/decorator/retry.py index d09ec608..e869bfad 100644 --- a/MangoServer/PyAutoTest/tools/decorator/retry.py +++ b/MangoServer/PyAutoTest/tools/decorator/retry.py @@ -18,11 +18,12 @@ def orm_retry(func_name: str, max_retries=5, delay=2): def decorator(func): def wrapper(*args, **kwargs): try_count = 0 - error = None + error = '' while try_count < max_retries: try: return func(*args, **kwargs) except Error as error: + error = error log.error(f'重试失败: 函数：{func_name}, 错误提示：{error}') close_old_connections() connection.ensure_connection() diff --git a/MangoServer/PyAutoTest/tools/view/response_msg.py b/MangoServer/PyAutoTest/tools/view/response_msg.py index 30169733..74d16f03 100644 --- a/MangoServer/PyAutoTest/tools/view/response_msg.py +++ b/MangoServer/PyAutoTest/tools/view/response_msg.py @@ -122,3 +122,4 @@ RESPONSE_MSG_0116 = (300, '内部保存失败，请检查数据：{}') RESPONSE_MSG_0117 = (300, '内部更新失败，请检查数据：{}') RESPONSE_MSG_0118 = (200, '获取产品名称成功') RESPONSE_MSG_0119 = (300, '每个项目的环境和类型，只允许开启一个') +RESPONSE_MSG_0120 = (300, '请先选择测试环境后再尝试') diff --git a/mango-console/src/api/uitest/index.ts b/mango-console/src/api/uitest/index.ts index 4a9e8742..55de19f4 100644 --- a/mango-console/src/api/uitest/index.ts +++ b/mango-console/src/api/uitest/index.ts @@ -405,11 +405,14 @@ export function getUiCaseStepsRefreshCacheData(id: number) { }, }) } -export function getUiConfigNewBrowserObj(is_recording: number) { +export function getUiConfigNewBrowserObj(id: number | null, is_recording: number) { return get({ url: url.uiConfigNewBrowserObj, data: () => { - return { is_recording: is_recording } + return { + id: id, + is_recording: is_recording, + } }, }) } diff --git a/mango-console/src/views/apitest/info/index.vue b/mango-console/src/views/apitest/info/index.vue index 4de2b0a7..807c3cee 100644 --- a/mango-console/src/views/apitest/info/index.vue +++ b/mango-console/src/views/apitest/info/index.vue @@ -432,7 +432,7 @@ cancelText: '取消', okText: '确定', onOk: () => { - getUiConfigNewBrowserObj(1) + getUiConfigNewBrowserObj(null, 1) .then((res) => { Message.success(res.msg) }) diff --git a/mango-console/src/views/uitest/equipment/index.vue b/mango-console/src/views/uitest/equipment/index.vue index d7e94c91..b2e1ffff 100644 --- a/mango-console/src/views/uitest/equipment/index.vue +++ b/mango-console/src/views/uitest/equipment/index.vue @@ -407,7 +407,7 @@ } function onDebugWEB(id: number) { - getUiConfigNewBrowserObj(id) + getUiConfigNewBrowserObj(id, 0) .then((res) => { data.driveType = res.data }) -- Gitee