feat: support retry when test step failed

This commit is contained in:
duanchao.bill
2022-04-06 20:53:32 +08:00
committed by debugtalk
parent 5e40e3692d
commit 596e6673fe
9 changed files with 96 additions and 8 deletions

View File

@@ -82,6 +82,9 @@ class TStep(BaseModel):
export: Export = []
validators: Validators = Field([], alias="validate")
validate_script: List[Text] = []
retry_times: int = 0
retry_interval: int = 0 # sec
class TestCase(BaseModel):

View File

@@ -12,10 +12,9 @@ except ModuleNotFoundError:
USE_ALLURE = False
from loguru import logger
from httprunner.client import HttpSession
from httprunner.config import Config
from httprunner.exceptions import ParamsError
from httprunner.exceptions import ParamsError, ValidationFailure
from httprunner.loader import load_project_meta
from httprunner.models import (ProjectMeta, StepResult, TConfig, TestCaseInOut,
TestCaseSummary, TestCaseTime, VariablesMapping)
@@ -25,7 +24,7 @@ from httprunner.utils import merge_variables
class SessionRunner(object):
config: Config
teststeps: List[object] # list of Step
teststeps: List[object] # list of Step
parser: Parser = None
session: HttpSession = None
@@ -162,11 +161,23 @@ class SessionRunner(object):
logger.info(f"run step begin: {step.name()} >>>>>>")
# run step
if USE_ALLURE:
with allure.step(f"step: {step.name()}"):
step_result: StepResult = step.run(self)
else:
step_result: StepResult = step.run(self)
for i in range(step.retry_times + 1):
try:
if USE_ALLURE:
with allure.step(f"step: {step.name()}"):
step_result: StepResult = step.run(self)
else:
step_result: StepResult = step.run(self)
break
except ValidationFailure:
if i == step.retry_times:
raise
else:
logger.warning(
f"run step {step.name()} validation failed,wait {step.retry_interval} sec and try again")
time.sleep(step.retry_interval)
logger.info(
f"run step retry ({i+1}/{step.retry_times} time): {step.name()} >>>>>>")
# save extracted variables to session variables
self.__session_variables.update(step_result.export_vars)

View File

@@ -27,6 +27,14 @@ class Step(object):
def testcase(self) -> TestCase:
return self.__step.struct().testcase
@property
def retry_times(self) -> int:
return self.__step.struct().retry_times
@property
def retry_interval(self) -> int:
return self.__step.struct().retry_interval
def struct(self) -> TStep:
return self.__step.struct()

View File

@@ -426,6 +426,11 @@ class RunRequest(object):
self.__step.variables.update(variables)
return self
def with_retry(self, retry_times, retry_interval) -> "RunRequest":
self.__step.retry_times = retry_times
self.__step.retry_interval = retry_interval
return self
def setup_hook(self, hook: Text, assign_var_name: Text = None) -> "RunRequest":
if assign_var_name:
self.__step.setup_hooks.append({assign_var_name: hook})

View File

@@ -80,6 +80,11 @@ class RunTestCase(object):
self.__step.variables.update(variables)
return self
def with_retry(self, retry_times, retry_interval) -> "RunRequest":
self.__step.retry_times = retry_times
self.__step.retry_interval = retry_interval
return self
def setup_hook(self, hook: Text, assign_var_name: Text = None) -> "RunTestCase":
if assign_var_name:
self.__step.setup_hooks.append({assign_var_name: hook})