mangoautomation 1.0.31__tar.gz → 1.0.33__tar.gz

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

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

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

@@ -255,7 +255,13 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         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
-        await self.__error_screenshot(file_path)
+        try:
+            await self.__error_screenshot(file_path)
+        except MangoAutomationError as error:
+            self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'
+        except Exception as error:
+            self.base_data.log.error(
+                f'截图失败未知异常-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
 
     async def __error_screenshot(self, file_path):
         if self.drive_type == DriveTypeEnum.WEB.value:

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

@@ -255,7 +255,13 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         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
-        self.__error_screenshot(file_path)
+        try:
+            self.__error_screenshot(file_path)
+        except MangoAutomationError as error:
+            self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'
+        except Exception as error:
+            self.base_data.log.error(
+                f'截图失败未知异常-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
 
     def __error_screenshot(self, file_path):
         if self.drive_type == DriveTypeEnum.WEB.value:

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

@@ -8,12 +8,12 @@ import os.path
 import traceback
 from urllib.parse import urlparse
 
-from playwright._impl._errors import TimeoutError, Error
+from playwright._impl._errors import TimeoutError, Error, TargetClosedError
 
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059
+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
 
@@ -41,11 +41,14 @@ class AsyncWebBrowser(metaclass=Meta):
             await self.base_data.page.goto(url, timeout=60000)
             await asyncio.sleep(2)
         except TimeoutError as error:
-            self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
+            self.base_data.log.debug(f'打开URL失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0013, value=(url,))
+        except TargetClosedError as error:
+            self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0010, value=(url,))
         except Error as error:
             self.base_data.log.debug(
-                f'打开URL失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                f'打开URL失败-3，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @async_method_callback('web', '浏览器操作', 2, [

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

@@ -8,12 +8,12 @@ import traceback
 from urllib.parse import urlparse
 
 import time
-from playwright._impl._errors import TimeoutError, Error
+from playwright._impl._errors import TimeoutError, Error, TargetClosedError
 
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059
+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 ....uidrive._base_data import BaseData
 
@@ -43,9 +43,12 @@ class SyncWebBrowser(metaclass=Meta):
         except TimeoutError as error:
             self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0013, value=(url,))
+        except TargetClosedError as error:
+            self.base_data.log.debug(f'打开URL失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0010, value=(url,))
         except Error as error:
             self.base_data.log.debug(
-                f'打开URL失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                f'打开URL失败-3，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @sync_method_callback('web', '浏览器操作', 2, [MethodModel(f='path', p='请输入截图保存路径', d=True)])

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

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

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

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