diff --git a/MangoActuator/autotest/ui/service/step_elements.py b/MangoActuator/autotest/ui/service/step_elements.py index eea89455c46ae25ad501e61119086e39df3c00ad..bda87f5d5f1243d3e1df90570864384e128187a1 100644 --- a/MangoActuator/autotest/ui/service/step_elements.py +++ b/MangoActuator/autotest/ui/service/step_elements.py @@ -91,27 +91,26 @@ class StepElements(ElementMain): log.error('自动化类型不存在,请联系管理员检查!') async def web_init(self, data: WEBConfigModel | None = None): - test_object_value = '' - if self.page is None: - if data: - self.driver_object.web_config = data - self.context, self.page = await self.driver_object.new_web_page() - else: - self.driver_object.web_config = self.page_step_model.equipment_config - self.context, self.page = await self.driver_object.new_web_page() - test_object_value = urljoin(self.page_step_model.environment_config.test_object_value, - self.page_step_model.url) - try: - if self.page and urlparse(self.url).netloc.lower()\ - != urlparse(test_object_value).netloc.lower() and not data: - await self.w_goto(test_object_value) - self.url = test_object_value - except Error as error: - if error.message == "Target page, context or browser has been closed": - self.page_step_result_model.status = StatusEnum.FAIL.value - self.page_step_result_model.error_message = error.message - self.page_step_result_model.element_result_list.append(self.element_test_result) - raise BrowserObjectClosed(*ERROR_MSG_0010) + if self.page: + return + if data: + self.driver_object.web_config = data + self.context, self.page = await self.driver_object.new_web_page() + else: + self.driver_object.web_config = self.page_step_model.equipment_config + self.context, self.page = await self.driver_object.new_web_page() + test_object_value = urljoin(self.page_step_model.environment_config.test_object_value, + self.page_step_model.url) + try: + if self.page and urlparse(self.url).netloc.lower() != urlparse(test_object_value).netloc.lower() and not data: + await self.w_goto(test_object_value) + self.url = test_object_value + except Error as error: + if error.message == "Target page, context or browser has been closed": + self.page_step_result_model.status = StatusEnum.FAIL.value + self.page_step_result_model.error_message = error.message + self.page_step_result_model.element_result_list.append(self.element_test_result) + raise BrowserObjectClosed(*ERROR_MSG_0010) def __android_init(self): package_name = self.page_step_model.environment_config.test_object_value