From 518d8abfd236494cae09dbf1aaddbc2ba89d0677 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Mon, 6 Jul 2020 21:30:11 +0800 Subject: [PATCH] refactor: change param name --- .../request_methods/request_with_parameters_test.py | 10 +++++----- httprunner/__init__.py | 4 ++-- httprunner/make.py | 8 ++++---- httprunner/runner.py | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/postman_echo/request_methods/request_with_parameters_test.py b/examples/postman_echo/request_methods/request_with_parameters_test.py index b4cbd308..5f90c15d 100644 --- a/examples/postman_echo/request_methods/request_with_parameters_test.py +++ b/examples/postman_echo/request_methods/request_with_parameters_test.py @@ -3,7 +3,7 @@ import pytest -from httprunner import parse_parameters +from httprunner import Parameters from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase @@ -11,8 +11,8 @@ from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase class TestCaseRequestWithParameters(HttpRunner): @pytest.mark.parametrize( - "parameters", - parse_parameters( + "param", + Parameters( { "user_agent": ["iOS/10.1", "iOS/10.2"], "username-password": "${parameterize(request_methods/account.csv)}", @@ -20,8 +20,8 @@ class TestCaseRequestWithParameters(HttpRunner): } ), ) - def test_start(self, parameters): - super().test_start(parameters) + def test_start(self, param): + super().test_start(param) config = ( Config("request methods testcase: validate with parameters") diff --git a/httprunner/__init__.py b/httprunner/__init__.py index 251d78c7..2fd95302 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -3,7 +3,7 @@ __description__ = "One-stop solution for HTTP(S) testing." # import firstly for monkey patch if needed from httprunner.ext.locust import main_locusts -from httprunner.parser import parse_parameters +from httprunner.parser import parse_parameters as Parameters from httprunner.runner import HttpRunner from httprunner.testcase import Config, Step, RunRequest, RunTestCase @@ -15,5 +15,5 @@ __all__ = [ "Step", "RunRequest", "RunTestCase", - "parse_parameters", + "Parameters", ] diff --git a/httprunner/make.py b/httprunner/make.py index 206642a8..13b95460 100644 --- a/httprunner/make.py +++ b/httprunner/make.py @@ -46,7 +46,7 @@ sys.path.insert(0, str(Path(__file__){% for _ in range(diff_levels) %}.parent{% {% if parameters %} import pytest -from httprunner import parse_parameters +from httprunner import Parameters {% endif %} from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase @@ -57,9 +57,9 @@ from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase class {{ class_name }}(HttpRunner): {% if parameters %} - @pytest.mark.parametrize('parameters', parse_parameters({{parameters}})) - def test_start(self, parameters): - super().test_start(parameters) + @pytest.mark.parametrize("param", Parameters({{parameters}})) + def test_start(self, param): + super().test_start(param) {% endif %} config = {{ config_chain_style }} diff --git a/httprunner/runner.py b/httprunner/runner.py index 2406acd1..64abf690 100644 --- a/httprunner/runner.py +++ b/httprunner/runner.py @@ -421,7 +421,7 @@ class HttpRunner(object): step_datas=self.__step_datas, ) - def test_start(self, parameters: Dict = None) -> "HttpRunner": + def test_start(self, param: Dict = None) -> "HttpRunner": """main entrance, discovered by pytest""" self.__init_tests__() self.__project_meta = self.__project_meta or load_project_meta( @@ -435,8 +435,8 @@ class HttpRunner(object): # parse config name config_variables = self.__config.variables - if parameters: - config_variables.update(parameters) + if param: + config_variables.update(param) config_variables.update(self.__session_variables) self.__config.name = parse_data( self.__config.name, config_variables, self.__project_meta.functions