mangoautomation 1.0.33__tar.gz → 1.0.34__tar.gz

{mangoautomation-1.0.33/mangoautomation.egg-info → mangoautomation-1.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.33
+Version: 1.0.34
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.33 → mangoautomation-1.0.34}/mangoautomation/uidrive/_async_element.py

@@ -7,7 +7,7 @@ import asyncio
 import os
 import traceback
 
-from playwright._impl._errors import TargetClosedError, Error, TimeoutError
+from playwright._impl._errors import TargetClosedError, Error
 
 from mangotools.assertion import PublicAssertion
 from mangotools.decorator import async_retry
@@ -241,22 +241,22 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             raise MangoAutomationError(*ERROR_MSG_0027)
 
     async def __error(self, msg: str):
-        self.element_result_model.status = StatusEnum.FAIL.value
-        self.element_result_model.error_message = msg
-        self.base_data.log.debug(
-            f"""
-            元素操作失败----->
-            元 素 对 象：{self.element_model.model_dump() if self.element_model else self.element_model}
-            元素测试结果：{
-            self.element_result_model.model_dump() if self.element_result_model else self.element_result_model}
-            """
-        )
-        file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
-        file_path = os.path.join(self.base_data.screenshot_path, file_name)
-        self.element_result_model.picture_path = file_path
-        self.element_result_model.picture_name = file_name
         try:
+            self.element_result_model.status = StatusEnum.FAIL.value
+            self.element_result_model.error_message = msg
+            self.base_data.log.debug(
+                f"""
+                元素操作失败----->
+                元 素 对 象：{self.element_model.model_dump() if self.element_model else self.element_model}
+                元素测试结果：{
+                self.element_result_model.model_dump() if self.element_result_model else self.element_result_model}
+                """
+            )
+            file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
+            file_path = os.path.join(self.base_data.screenshot_path, file_name)
             await self.__error_screenshot(file_path)
+            self.element_result_model.picture_path = file_path
+            self.element_result_model.picture_name = file_name
         except MangoAutomationError as error:
             self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'
         except Exception as error:
@@ -265,18 +265,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
 
     async def __error_screenshot(self, file_path):
         if self.drive_type == DriveTypeEnum.WEB.value:
-            try:
-                await self.w_screenshot(file_path)
-            except (TargetClosedError, TimeoutError) as error:
-                self.base_data.log.debug(
-                    f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                self.base_data.setup()
-                raise MangoAutomationError(*ERROR_MSG_0010)
-            except AttributeError as error:
-                self.base_data.log.debug(
-                    f'截图出现异常失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                self.base_data.setup()
-                raise MangoAutomationError(*ERROR_MSG_0010)
+            await self.w_screenshot(file_path)
         elif self.drive_type == DriveTypeEnum.ANDROID.value:
             self.a_screenshot(file_path)
         else:

{mangoautomation-1.0.33 → mangoautomation-1.0.34}/mangoautomation/uidrive/_sync_element.py

@@ -7,7 +7,7 @@ import os
 import traceback
 
 import time
-from playwright._impl._errors import TargetClosedError, Error, TimeoutError
+from playwright._impl._errors import TargetClosedError, Error
 
 from mangotools.assertion import PublicAssertion
 from mangotools.decorator import sync_retry
@@ -241,22 +241,22 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             raise MangoAutomationError(*ERROR_MSG_0027)
 
     def __error(self, msg: str):
-        self.element_result_model.status = StatusEnum.FAIL.value
-        self.element_result_model.error_message = msg
-        self.base_data.log.debug(
-            f"""
-            元素操作失败----->
-            元 素 对 象：{self.element_model.model_dump() if self.element_model else self.element_model}
-            元素测试结果：{
-            self.element_result_model.model_dump() if self.element_result_model else self.element_result_model}
-            """
-        )
-        file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
-        file_path = os.path.join(self.base_data.screenshot_path, file_name)
-        self.element_result_model.picture_path = file_path
-        self.element_result_model.picture_name = file_name
         try:
+            self.element_result_model.status = StatusEnum.FAIL.value
+            self.element_result_model.error_message = msg
+            self.base_data.log.debug(
+                f"""
+                元素操作失败----->
+                元 素 对 象：{self.element_model.model_dump() if self.element_model else self.element_model}
+                元素测试结果：{
+                self.element_result_model.model_dump() if self.element_result_model else self.element_result_model}
+                """
+            )
+            file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
+            file_path = os.path.join(self.base_data.screenshot_path, file_name)
             self.__error_screenshot(file_path)
+            self.element_result_model.picture_path = file_path
+            self.element_result_model.picture_name = file_name
         except MangoAutomationError as error:
             self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'
         except Exception as error:
@@ -265,18 +265,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
 
     def __error_screenshot(self, file_path):
         if self.drive_type == DriveTypeEnum.WEB.value:
-            try:
-                self.w_screenshot(file_path)
-            except (TargetClosedError, TimeoutError) as error:
-                self.base_data.log.debug(
-                    f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                self.base_data.setup()
-                raise MangoAutomationError(*ERROR_MSG_0010)
-            except AttributeError as error:
-                self.base_data.log.debug(
-                    f'截图出现异常失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                self.base_data.setup()
-                raise MangoAutomationError(*ERROR_MSG_0010)
+            self.w_screenshot(file_path)
         elif self.drive_type == DriveTypeEnum.ANDROID.value:
             self.a_screenshot(file_path)
         else:

{mangoautomation-1.0.33 → mangoautomation-1.0.34}/mangoautomation/uidrive/web/async_web/_browser.py

@@ -12,10 +12,10 @@ from playwright._impl._errors import TimeoutError, Error, TargetClosedError
 
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
+from ..._base_data import BaseData
 from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
 from ....tools import Meta
-from ..._base_data import BaseData
 
 
 class AsyncWebBrowser(metaclass=Meta):
@@ -55,7 +55,18 @@ class AsyncWebBrowser(metaclass=Meta):
         MethodModel(f='path', p='请输入截图保存路径', d=True)])
     async def w_screenshot(self, path: str):
         """整个页面截图"""
-        await self.base_data.page.screenshot(path=path, full_page=True)
+        try:
+            await self.base_data.page.screenshot(path=path, full_page=True)
+        except (TargetClosedError, TimeoutError) as error:
+            self.base_data.log.debug(
+                f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            self.base_data.setup()
+            raise MangoAutomationError(*ERROR_MSG_0010)
+        except AttributeError as error:
+            self.base_data.log.debug(
+                f'截图出现异常失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            self.base_data.setup()
+            raise MangoAutomationError(*ERROR_MSG_0010)
 
     @async_method_callback('web', '浏览器操作', 3)
     async def w_alert(self):

{mangoautomation-1.0.33 → mangoautomation-1.0.34}/mangoautomation/uidrive/web/sync_web/_browser.py

@@ -54,7 +54,18 @@ class SyncWebBrowser(metaclass=Meta):
     @sync_method_callback('web', '浏览器操作', 2, [MethodModel(f='path', p='请输入截图保存路径', d=True)])
     def w_screenshot(self, path: str):
         """整个页面截图"""
-        self.base_data.page.screenshot(path=path, full_page=True)
+        try:
+            self.base_data.page.screenshot(path=path, full_page=True)
+        except (TargetClosedError, TimeoutError) as error:
+            self.base_data.log.debug(
+                f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            self.base_data.setup()
+            raise MangoAutomationError(*ERROR_MSG_0010)
+        except AttributeError as error:
+            self.base_data.log.debug(
+                f'截图出现异常失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+            self.base_data.setup()
+            raise MangoAutomationError(*ERROR_MSG_0010)
 
     @sync_method_callback('web', '浏览器操作', 3)
     def w_alert(self):

{mangoautomation-1.0.33 → mangoautomation-1.0.34/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.33
+Version: 1.0.34
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.33 → mangoautomation-1.0.34}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.33'
+__version__ = '1.0.34'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()