GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-04 23:16:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: update examples

Browse Source
This commit is contained in:
debugtalk
2020-05-18 23:22:03 +08:00
parent 870cc9f18b
commit 2063bf81d6
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/postman_echo/request_methods/demo_testsuite/request_with_testcase_reference_test.py
+2 -2
View File
@@ -17,9 +17,9 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
teststeps = [ teststeps = [
TStep( TStep(
**{ **{
"name": "request with variables", "name": "request with functions",
"variables": {"foo1": "override_bar1"}, "variables": {"foo1": "override_bar1"},
"testcase": "request_methods/request_with_variables.yml", "testcase": "request_methods/request_with_functions.yml",
} }
), ),
] ]
examples/postman_echo/request_methods/hardcode_test.py
+1
View File
@@ -10,6 +10,7 @@ class TestCaseHardcode(HttpRunner):
"base_url": "https://postman-echo.com", "base_url": "https://postman-echo.com",
"verify": False, "verify": False,
"path": "examples/postman_echo/request_methods/hardcode_test.py", "path": "examples/postman_echo/request_methods/hardcode_test.py",
"variables": {},
} }
) )
examples/postman_echo/request_methods/request_with_testcase_reference.yml
+2 -2
View File
@@ -7,7 +7,7 @@ config:
teststeps: teststeps:
- -
name: request with variables name: request with functions
variables: variables:
foo1: override_bar1 foo1: override_bar1
testcase: request_methods/request_with_variables.yml testcase: request_methods/request_with_functions.yml
examples/postman_echo/request_methods/request_with_testcase_reference_test.py
+2 -2
View File
@@ -17,9 +17,9 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
teststeps = [ teststeps = [
TStep( TStep(
**{ **{
"name": "request with variables", "name": "request with functions",
"variables": {"foo1": "override_bar1"}, "variables": {"foo1": "override_bar1"},
"testcase": "request_methods/request_with_variables.yml", "testcase": "request_methods/request_with_functions.yml",
} }
), ),
] ]
httprunner/ext/make/__init__.py
+6 -6
View File
@@ -102,7 +102,6 @@ def make_testcase(testcase: Dict) -> Union[str, None]:
} }
content = template.render(data) content = template.render(data)
os.makedirs(os.path.dirname(testcase_python_path), exist_ok=True)
with open(testcase_python_path, "w") as f: with open(testcase_python_path, "w") as f:
f.write(content) f.write(content)
@@ -134,6 +133,9 @@ def make_testsuite(testsuite: Dict) -> List[Text]:
logger.info(f"start to make testsuite: {testsuite_path}") 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 = [] testcase_files = []
for testcase in testsuite["testcases"]: 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_path = os.path.join(project_working_directory, testcase_file)
testcase_dict = load_test_file(testcase_path) testcase_dict = load_test_file(testcase_path)
testcase_dict.setdefault("config", {}) 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 # override testcase name
testcase_dict["config"]["name"] = 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(testcase.get("variables", {}))
testcase_dict["config"]["variables"].update(testsuite_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 # make testcase
testcase_path = make_testcase(testcase_dict) testcase_path = make_testcase(testcase_dict)
testcase_files.append(testcase_path) testcase_files.append(testcase_path)
httprunner/runner_test.py
+3 -3
View File
@@ -9,11 +9,11 @@ class TestHttpRunner(unittest.TestCase):
def test_run_testcase_by_path_request_only(self): def test_run_testcase_by_path_request_only(self):
self.runner.run_path( 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() result = self.runner.get_summary()
self.assertTrue(result.success) 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(result.step_datas[0].name, "get with params")
self.assertEqual(len(result.step_datas), 3) self.assertEqual(len(result.step_datas), 3)
@@ -24,5 +24,5 @@ class TestHttpRunner(unittest.TestCase):
result = self.runner.get_summary() result = self.runner.get_summary()
self.assertTrue(result.success) self.assertTrue(result.success)
self.assertEqual(result.name, "request methods testcase: reference testcase") 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) self.assertEqual(len(result.step_datas), 1)