fix: windows not support thrift

This commit is contained in:
duanchao.bill
2022-05-04 14:23:09 +08:00
parent ba069e3d2d
commit 1de270f089
3 changed files with 45 additions and 14 deletions

View File

@@ -2,6 +2,7 @@ __version__ = "4.0.0-beta"
__description__ = "One-stop solution for HTTP(S) testing."
from httprunner.config import Config
import platform
from httprunner.parser import parse_parameters as Parameters
from httprunner.runner import HttpRunner
from httprunner.step import Step
@@ -12,11 +13,6 @@ from httprunner.step_sql_request import (
StepSqlRequestValidation,
StepSqlRequestExtraction,
)
from httprunner.step_thrift_request import (
RunThriftRequest,
StepThriftRequestValidation,
StepThriftRequestExtraction,
)
__all__ = [
"__version__",
@@ -28,9 +24,20 @@ __all__ = [
"RunSqlRequest",
"StepSqlRequestValidation",
"StepSqlRequestExtraction",
"RunThriftRequest",
"StepThriftRequestValidation",
"StepThriftRequestExtraction",
"RunTestCase",
"Parameters",
]
if platform.system() != "Windows":
from httprunner.step_thrift_request import (
RunThriftRequest,
StepThriftRequestValidation,
StepThriftRequestExtraction,
)
__all__.extend(
[
"RunThriftRequest",
"StepThriftRequestValidation",
"StepThriftRequestExtraction",
]
)

View File

@@ -1,3 +1,4 @@
import platform
from typing import Union
from httprunner.models import StepResult, TRequest, TStep, TestCase
@@ -14,8 +15,6 @@ from httprunner.step_sql_request import (
StepSqlRequestExtraction,
)
from httprunner.step_thrift_request import RunThriftRequest,StepThriftRequestValidation,StepThriftRequestExtraction
class Step(object):
def __init__(
@@ -28,9 +27,6 @@ class Step(object):
RunSqlRequest,
StepSqlRequestValidation,
StepSqlRequestExtraction,
RunThriftRequest,
StepThriftRequestValidation,
StepThriftRequestExtraction
],
):
self.__step = step
@@ -62,3 +58,29 @@ class Step(object):
def run(self, runner: HttpRunner) -> StepResult:
return self.__step.run(runner)
if platform.system() != "Windows":
from httprunner.step_thrift_request import (
RunThriftRequest,
StepThriftRequestValidation,
StepThriftRequestExtraction,
)
class Step(Step):
def __init__(
self,
step: Union[
StepRequestValidation,
StepRequestExtraction,
RequestWithOptionalArgs,
StepRefCase,
RunSqlRequest,
StepSqlRequestValidation,
StepSqlRequestExtraction,
RunThriftRequest,
StepThriftRequestValidation,
StepThriftRequestExtraction,
],
):
super().__init__(step)

View File

@@ -189,7 +189,9 @@ class RunThriftRequest(IStep):
return self
def setup_hook(self, hook: Text, assign_var_name: Text = None) -> "RunThriftRequest":
def setup_hook(
self, hook: Text, assign_var_name: Text = None
) -> "RunThriftRequest":
if assign_var_name:
self.__step.setup_hooks.append({assign_var_name: hook})
else: