Merge pull request #267 from ctripcorp/266-web-语句中无timeout的场景增加重试机制

 feat: web增加重试机制

Author: clgwlg

flybirds/core/config_manage.py

@@ -360,6 +360,10 @@ def __init__(self, user_data, config):
                 "waitEleTimeout",
                 return_value(frame_config.get("waitEleTimeout", 10), 10)
             )
+            self.retry_ele_timeout = user_data.get(
+                "retryEleTimeout",
+                return_value(frame_config.get("retryEleTimeout", 10), 10)
+            )
             self.wait_ele_disappear = user_data.get(
                 "waitEleDisappear",
                 return_value(frame_config.get("waitEleDisappear", 10), 10)
@@ -466,6 +470,8 @@ def __init__(self, user_data, config):
     def set_frame_info_attrs(self, user_data):
         if not hasattr(self, "wait_ele_timeout"):
             self.wait_ele_timeout = user_data.get("waitEleTimeout", 10)
+        if not hasattr(self, "retry_ele_timeout"):
+            self.retry_ele_timeout = user_data.get("retryEleTimeout", 30)
         if not hasattr(self, "wait_ele_disappear"):
             self.wait_ele_disappear = user_data.get("waitEleDisappear", 10)
         if not hasattr(self, "click_verify_timeout"):

flybirds/core/dsl/step/element.py

@@ -5,7 +5,7 @@
 from behave import step
 
 from flybirds.core.global_context import GlobalContext as g_Context
-from flybirds.utils.dsl_helper import ele_wrap, VerifyStep
+from flybirds.utils.dsl_helper import ele_wrap, VerifyStep, RetryType
 
 
 @step("text[{selector}]property[{param2}]is {param3}")
@@ -272,6 +272,7 @@ def full_screen_swipe(context, param1=None, param2=None):
 @step("exist text[{selector}]")
 @VerifyStep()
 @ele_wrap
+@RetryType('timeout')
 def wait_text_exist(context, selector=None):
     """
     The specified text element string exists in the page
@@ -347,6 +348,7 @@ def wait_ocr_text_appear(context, selector=None):
 @step("not exist text[{selector}]")
 @VerifyStep()
 @ele_wrap
+@RetryType('timeout')
 def text_not_exist(context, selector=None):
     """
     The specified text element string does not exist in the page
@@ -409,6 +411,7 @@ def wait_ele_exit(context, selector=None):
 @step("not exist element[{selector}]")
 @VerifyStep()
 @ele_wrap
+@RetryType('timeout')
 def ele_not_exit(context, selector=None):
     """
     The specified selector element string does not exists in the page

flybirds/utils/dsl_helper.py

@@ -13,13 +13,28 @@
 
 # generate result_dic
 from flybirds.core.global_context import GlobalContext
+import time
 
 if six.PY2:
     # -- USE PYTHON3 BACKPORT: With unicode traceback support.
     import traceback2 as traceback
 else:
     import traceback
 
+import asyncio
+import nest_asyncio
+
+nest_asyncio.apply()
+tim_loop = asyncio.new_event_loop()
+
+
+async def sleep_t(t):
+    await asyncio.sleep(t)
+
+
+def sleep(sleep_time):
+    tim_loop.run_until_complete(sleep_t(sleep_time))
+
 
 def add_res_dic(dsl_params, functin_pattern, def_key):
     result_dic = {}
@@ -250,3 +265,44 @@ def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
 
         return wrapper
+
+
+class RetryType:
+    def __init__(self, *args, **kwargs):  # 类装饰器参数
+        self.retry = args[0]
+
+    def __call__(self, func):  # 被装饰函数
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            if gr.get_platform() is not None \
+                    and gr.get_platform().lower() == "web":
+                self.retryTimeOut = gr.get_frame_config_value("retry_ele_timeout", 30)
+
+                self.waitTimeInterval = max(self.retryTimeOut // 30, 1)
+                self.retryTimes = max(self.retryTimeOut // self.waitTimeInterval, 1)
+                self.recordMaxRetryTimes = self.retryTimes
+                self.runSuccess = False
+                log.info(
+                    f'retry start retryTimeOut: {self.retryTimeOut}s, self.waitTimeInterval: {self.waitTimeInterval}s, maxRetryTimes: {self.recordMaxRetryTimes}')
+                while self.retryTimes > 0:
+                    try:
+                        func(*args, **kwargs)
+                        self.runSuccess = True
+                        if self.runSuccess == True:
+                            log.info(
+                                f'retry success, max retry times: {self.recordMaxRetryTimes},  retry times: {self.recordMaxRetryTimes - self.retryTimes}')
+                            break
+                    except Exception as e:
+                        self.retryTimes -= 1
+                        if self.retryTimes == 0:
+                            log.info(f'retry fail during {self.retryTimeOut}s, retry times: {self.recordMaxRetryTimes}')
+                            raise e
+                        else:
+                            log.info(
+                                f'retry sleep interval {self.waitTimeInterval}s，current retry times: {self.recordMaxRetryTimes - self.retryTimes}')
+                            sleep(self.waitTimeInterval)
+                            pass
+            else:
+                func(*args, **kwargs)
+
+        return wrapper