mangoautomation 1.0.31__py3-none-any.whl → 1.0.33__py3-none-any.whl

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/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/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/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.dist-info → mangoautomation-1.0.33.dist-info}/METADATA

@@ -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.dist-info → mangoautomation-1.0.33.dist-info}/RECORD

@@ -10,10 +10,10 @@ mangoautomation/models/_ui_model.py,sha256=IGophozQMO-NQjM_DPdlwud484yfWQw1CRwbD
 mangoautomation/tools/__init__.py,sha256=i0rZF_gS0h1Rd0bMhgDSJp4JbEb3rm33zg-MDEX7KdE,342
 mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
 mangoautomation/uidrive/__init__.py,sha256=Tk_gh4Qg2qnewEGxa-7Id4fkQLY3fvQE4X7JB0BEscY,577
-mangoautomation/uidrive/_async_element.py,sha256=C3tjoN7PzChuINMa1XgR9G-rCxfn0OSbDG9F6v5IPmg,13567
+mangoautomation/uidrive/_async_element.py,sha256=Va8uMzLPLk7eS4Gxa2qmMYmoIEx2HE4AURc23BYimZI,13993
 mangoautomation/uidrive/_base_data.py,sha256=OCg5HXk_2sMgf5A6JTJErKLC8nZfhbzwKBRJHCDMueA,3174
 mangoautomation/uidrive/_driver_object.py,sha256=Re8j6VLHKfwW2VFdi-1XFRuix8tRBLcHYRBLVF6CApE,1962
-mangoautomation/uidrive/_sync_element.py,sha256=FbP8bLYnlPMZtfJDdhHxavP9snYgP0vMBoRniFe41_s,13379
+mangoautomation/uidrive/_sync_element.py,sha256=v6WI_5KVpvdG_3z5vt_gpmp3pFChAfL6c8WtUUmLzUY,13805
 mangoautomation/uidrive/android/__init__.py,sha256=FSIzfPane33QEj6bXslpd8bF1xGCDwMAHBOrpNzdyE4,5874
 mangoautomation/uidrive/android/_application.py,sha256=frvRyqUlx6__3j4xQdaJ4SOnEnipR3uPCOnWKDrkT7Y,2771
 mangoautomation/uidrive/android/_assertion.py,sha256=xkSBdjSfAbYtidHWWWY7Ko2OYaHi9OcZZOlnqIUT-FM,3611
@@ -31,7 +31,7 @@ mangoautomation/uidrive/pc/new_windows.py,sha256=lETHZa7cW8Z0iUShzgVTRxqivkYaOo8
 mangoautomation/uidrive/web/__init__.py,sha256=MgTklzty_SvX4UemCnqJuViq3cIjUgAjFoEtP-mcDWw,123
 mangoautomation/uidrive/web/async_web/__init__.py,sha256=gJxCPWUALVzbQJAM5RH_1-7Jto0hcm1kAXy72pZw24g,9106
 mangoautomation/uidrive/web/async_web/_assertion.py,sha256=8cLYPe3pP6FrcjDZoFOphP7psgoJJMozq0Z_BDGNXCo,11859
-mangoautomation/uidrive/web/async_web/_browser.py,sha256=s7piT1w8UHocwF9OnZkff8rFfuNHRMSjCxOSM4BC5DQ,4327
+mangoautomation/uidrive/web/async_web/_browser.py,sha256=wrljG5G7CX_B8rtfH_QRuy8WRxphKFZIVvpfH-SEF8U,4587
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
 mangoautomation/uidrive/web/async_web/_element.py,sha256=kIIc7DRlsMYj7oCfprf4EdP3Ez8FNN6mnfJ0RZdRXlo,9116
 mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
@@ -39,7 +39,7 @@ mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=bru_zVQ5Z_FEvuX1h8y
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
 mangoautomation/uidrive/web/sync_web/__init__.py,sha256=vHDYYESVi-6ApllUXOrDopcQod3dBXcPlTSAng8eIGE,8662
 mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=zZ4_4WiBQFSRwAh0P0JANa5z-ozbNTh3bnUqcZBti9s,11424
-mangoautomation/uidrive/web/sync_web/_browser.py,sha256=vQJq-TWEUq0rHWLWglE5wptqy8WQKWy4P3NUr2pzsSA,4187
+mangoautomation/uidrive/web/sync_web/_browser.py,sha256=Fp5UeQix4Qizi2Rq1C6gyIJ4pDYB_BtS-Sh3UeIrxLE,4447
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
 mangoautomation/uidrive/web/sync_web/_element.py,sha256=6qkn88PVl0XNtXF0jfbePXMqsRht4glidN-MuqghWZE,8716
 mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=8t6tJgMb4zgb4Sv02XP3gUU0ZVbApCs3WaILv8Fe1iY,3169
@@ -48,8 +48,8 @@ mangoautomation/uidrive/web/sync_web/_page.py,sha256=MNekcL7o5YXEloeuvi3YrpOZxGh
 tests/__init__.py,sha256=UhCNFqiVjxdh4CXESNo4oE7qfjpYYVkeHbSE5-7LGDY,125
 tests/test_ui_and.py,sha256=4k0_3bx_k2KbZifeRWGK65sxtdiPUOjkNzZ5oxjrc18,672
 tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.0.31.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.31.dist-info/METADATA,sha256=lkXHSS543EeOVw-z3_QFOTJpqV_F_YYirHxOblOlluc,625
-mangoautomation-1.0.31.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.31.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.31.dist-info/RECORD,,
+mangoautomation-1.0.33.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.0.33.dist-info/METADATA,sha256=_kKhgFndcusEnJpa65YLXyA7APOn4NqNf7PXaoivSCU,625
+mangoautomation-1.0.33.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.0.33.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.33.dist-info/RECORD,,