From 3c48078c22fe35c04019e42b6453b5d1a8e8ec84 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Mon, 18 May 2020 23:18:49 +0800 Subject: [PATCH] test: update examples --- .../request_with_testcase_reference_test.py | 4 ++-- .../postman_echo/request_methods/hardcode_test.py | 1 + .../request_with_testcase_reference.yml | 4 ++-- .../request_with_testcase_reference_test.py | 4 ++-- httprunner/ext/make/__init__.py | 12 ++++++------ httprunner/runner_test.py | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py index bb53226e..fae547cd 100644 --- a/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py @@ -17,9 +17,9 @@ class TestCaseRequestWithTestcaseReference(HttpRunner): teststeps = [ TStep( **{ - "name": "request with variables", + "name": "request with functions", "variables": {"foo1": "override_bar1"}, - "testcase": "request_methods/request_with_variables.yml", + "testcase": "request_methods/request_with_functions.yml", } ), ] diff --git a/examples/postman_echo/request_methods/hardcode_test.py b/examples/postman_echo/request_methods/hardcode_test.py index e60254c4..934c0d66 100644 --- a/examples/postman_echo/request_methods/hardcode_test.py +++ b/examples/postman_echo/request_methods/hardcode_test.py @@ -10,6 +10,7 @@ class TestCaseHardcode(HttpRunner): "base_url": "https://postman-echo.com", "verify": False, "path": "examples/postman_echo/request_methods/hardcode_test.py", + "variables": {}, } ) diff --git a/examples/postman_echo/request_methods/request_with_testcase_reference.yml b/examples/postman_echo/request_methods/request_with_testcase_reference.yml index 7e139535..3b2bfbdc 100644 --- a/examples/postman_echo/request_methods/request_with_testcase_reference.yml +++ b/examples/postman_echo/request_methods/request_with_testcase_reference.yml @@ -7,7 +7,7 @@ config: teststeps: - - name: request with variables + name: request with functions variables: foo1: override_bar1 - testcase: request_methods/request_with_variables.yml + testcase: request_methods/request_with_functions.yml diff --git a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py index 55b3db9c..229c04fc 100644 --- a/examples/postman_echo/request_methods/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/request_with_testcase_reference_test.py @@ -17,9 +17,9 @@ class TestCaseRequestWithTestcaseReference(HttpRunner): teststeps = [ TStep( **{ - "name": "request with variables", + "name": "request with functions", "variables": {"foo1": "override_bar1"}, - "testcase": "request_methods/request_with_variables.yml", + "testcase": "request_methods/request_with_functions.yml", } ), ] diff --git a/httprunner/ext/make/__init__.py b/httprunner/ext/make/__init__.py index 9b5d437b..a4df826a 100644 --- a/httprunner/ext/make/__init__.py +++ b/httprunner/ext/make/__init__.py @@ -102,7 +102,6 @@ def make_testcase(testcase: Dict) -> Union[str, None]: } content = template.render(data) - os.makedirs(os.path.dirname(testcase_python_path), exist_ok=True) with open(testcase_python_path, "w") as f: f.write(content) @@ -134,6 +133,9 @@ def make_testsuite(testsuite: Dict) -> List[Text]: logger.info(f"start to make testsuite: {testsuite_path}") + # create directory with testsuite file name, put its testcases under this directory + os.makedirs(os.path.dirname(os.path.splitext(testsuite_path)[0]), exist_ok=True) + testcase_files = [] for testcase in testsuite["testcases"]: @@ -142,6 +144,9 @@ def make_testsuite(testsuite: Dict) -> List[Text]: testcase_path = os.path.join(project_working_directory, testcase_file) testcase_dict = load_test_file(testcase_path) testcase_dict.setdefault("config", {}) + testcase_dict["config"]["path"] = os.path.join( + os.path.splitext(testsuite_path)[0], os.path.basename(testcase_path) + ) # override testcase name testcase_dict["config"]["name"] = testcase["name"] @@ -154,11 +159,6 @@ def make_testsuite(testsuite: Dict) -> List[Text]: testcase_dict["config"]["variables"].update(testcase.get("variables", {})) testcase_dict["config"]["variables"].update(testsuite_variables) - # create directory with testsuite file name, put its testcases under this directory - testcase_dict["config"]["path"] = os.path.join( - os.path.splitext(testsuite_path)[0], os.path.basename(testcase_path) - ) - # make testcase testcase_path = make_testcase(testcase_dict) testcase_files.append(testcase_path) diff --git a/httprunner/runner_test.py b/httprunner/runner_test.py index ca84584f..39d9d978 100644 --- a/httprunner/runner_test.py +++ b/httprunner/runner_test.py @@ -9,11 +9,11 @@ class TestHttpRunner(unittest.TestCase): def test_run_testcase_by_path_request_only(self): self.runner.run_path( - "examples/postman_echo/request_methods/request_with_variables.yml" + "examples/postman_echo/request_methods/request_with_functions.yml" ) result = self.runner.get_summary() self.assertTrue(result.success) - self.assertEqual(result.name, "request methods testcase with variables") + self.assertEqual(result.name, "request methods testcase with functions") self.assertEqual(result.step_datas[0].name, "get with params") self.assertEqual(len(result.step_datas), 3) @@ -24,5 +24,5 @@ class TestHttpRunner(unittest.TestCase): result = self.runner.get_summary() self.assertTrue(result.success) self.assertEqual(result.name, "request methods testcase: reference testcase") - self.assertEqual(result.step_datas[0].name, "request with variables") + self.assertEqual(result.step_datas[0].name, "request with functions") self.assertEqual(len(result.step_datas), 1)