From c2ee26d5b570c659c809db8f518795966ebe35de Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 19 May 2020 10:42:16 +0800 Subject: [PATCH] change: testsuite pytest dirname --- .../request_with_functions_test.py | 4 ++-- .../request_with_testcase_reference_test.py | 4 ++-- httprunner/ext/make/__init__.py | 5 +++-- httprunner/ext/make/make_test.py | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) rename examples/postman_echo/request_methods/{demo_testsuite => demo_testsuite_yml}/request_with_functions_test.py (95%) rename examples/postman_echo/request_methods/{demo_testsuite => demo_testsuite_yml}/request_with_testcase_reference_test.py (84%) diff --git a/examples/postman_echo/request_methods/demo_testsuite/request_with_functions_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py similarity index 95% rename from examples/postman_echo/request_methods/demo_testsuite/request_with_functions_test.py rename to examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py index aaec48f9..887c0d28 100644 --- a/examples/postman_echo/request_methods/demo_testsuite/request_with_functions_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py @@ -1,5 +1,5 @@ # NOTICE: Generated By HttpRunner. DO'NOT EDIT! -# FROM: examples/postman_echo/request_methods/demo_testsuite/request_with_functions.yml +# FROM: examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions.yml from httprunner import HttpRunner, TConfig, TStep @@ -10,7 +10,7 @@ class TestCaseRequestWithFunctions(HttpRunner): "variables": {"foo1": "session_bar1", "var1": "testsuite_val1"}, "base_url": "https://postman-echo.com", "verify": False, - "path": "examples/postman_echo/request_methods/demo_testsuite/request_with_functions_test.py", + "path": "examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py", } ) diff --git a/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py similarity index 84% rename from examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py rename to examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py index fae547cd..9a714755 100644 --- a/examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py +++ b/examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py @@ -1,5 +1,5 @@ # NOTICE: Generated By HttpRunner. DO'NOT EDIT! -# FROM: examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference.yml +# FROM: examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference.yml from httprunner import HttpRunner, TConfig, TStep @@ -10,7 +10,7 @@ class TestCaseRequestWithTestcaseReference(HttpRunner): "variables": {"foo1": "session_bar1", "var2": "testsuite_val2"}, "base_url": "https://postman-echo.com", "verify": False, - "path": "examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py", + "path": "examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py", } ) diff --git a/httprunner/ext/make/__init__.py b/httprunner/ext/make/__init__.py index a4df826a..466dddd1 100644 --- a/httprunner/ext/make/__init__.py +++ b/httprunner/ext/make/__init__.py @@ -134,7 +134,8 @@ 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) + testsuite_dir = testsuite_path.replace(".", "_") + os.makedirs(testsuite_dir, exist_ok=True) testcase_files = [] @@ -145,7 +146,7 @@ def make_testsuite(testsuite: Dict) -> List[Text]: 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) + testsuite_dir, os.path.basename(testcase_path) ) # override testcase name diff --git a/httprunner/ext/make/make_test.py b/httprunner/ext/make/make_test.py index 7de86252..7145807c 100644 --- a/httprunner/ext/make/make_test.py +++ b/httprunner/ext/make/make_test.py @@ -59,10 +59,10 @@ class TestLoader(unittest.TestCase): testcase_python_list = main_make(path) self.assertEqual(len(testcase_python_list), 2) self.assertIn( - "examples/postman_echo/request_methods/demo_testsuite/request_with_functions_test.py", + "examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py", testcase_python_list, ) self.assertIn( - "examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py", + "examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py", testcase_python_list, )