GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-08 19:32:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor function name: load_testcases_by_path => load_testsets_by_path

Browse Source
This commit is contained in:
httprunner
2018-04-17 21:42:48 +08:00
parent a92f382571
commit 5dfdd6ad93
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
httprunner/task.py
View File

@@ -195,7 +195,7 @@ def init_task_suite(path_or_testsets, mapping=None, http_client_session=None):
""" initialize task suite """ initialize task suite
""" """
if not testcase.is_testsets(path_or_testsets): if not testcase.is_testsets(path_or_testsets):
testsets = testcase.load_testcases_by_path(path_or_testsets) testsets = testcase.load_testsets_by_path(path_or_testsets)
else: else:
testsets = path_or_testsets testsets = path_or_testsets

6
httprunner/testcase.py
View File

@@ -199,7 +199,7 @@ def load_test_dependencies():
suite["function_meta"] = function_meta suite["function_meta"] = function_meta
test_def_overall_dict["suite"][function_meta["func_name"]] = suite test_def_overall_dict["suite"][function_meta["func_name"]] = suite
def load_testcases_by_path(path): def load_testsets_by_path(path):
""" load testcases from file path """ load testcases from file path
@param path: path could be in several type @param path: path could be in several type
- absolute/relative file path - absolute/relative file path
@@ -215,7 +215,7 @@ def load_testcases_by_path(path):
testsets = [] testsets = []
for file_path in set(path): for file_path in set(path):
testset = load_testcases_by_path(file_path) testset = load_testsets_by_path(file_path)
if not testset: if not testset:
continue continue
testsets.extend(testset) testsets.extend(testset)
@@ -230,7 +230,7 @@ def load_testcases_by_path(path):
if os.path.isdir(path): if os.path.isdir(path):
files_list = utils.load_folder_files(path) files_list = utils.load_folder_files(path)
testcases_list = load_testcases_by_path(files_list) testcases_list = load_testsets_by_path(files_list)
elif os.path.isfile(path): elif os.path.isfile(path):
try: try:

2
tests/test_runner.py
View File

@@ -146,7 +146,7 @@ class TestRunner(ApiServerUnittest):
def test_run_testcase_with_empty_header(self): def test_run_testcase_with_empty_header(self):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'tests/data/test_bugfix.yml') os.getcwd(), 'tests/data/test_bugfix.yml')
testsets = testcase.load_testcases_by_path(testcase_file_path) testsets = testcase.load_testsets_by_path(testcase_file_path)
testset = testsets[0] testset = testsets[0]
config_dict_headers = testset["config"]["request"]["headers"] config_dict_headers = testset["config"]["request"]["headers"]
test_dict_headers = testset["testcases"][0]["request"]["headers"] test_dict_headers = testset["testcases"][0]["request"]["headers"]

20
tests/test_testcase.py
View File

@@ -556,7 +556,7 @@ class TestcaseParserUnittest(unittest.TestCase):
# absolute file path # absolute file path
path = os.path.join( path = os.path.join(
os.getcwd(), 'tests/data/demo_testset_hardcode.json') os.getcwd(), 'tests/data/demo_testset_hardcode.json')
testset_list = testcase.load_testcases_by_path(path) testset_list = testcase.load_testsets_by_path(path)
self.assertEqual(len(testset_list), 1) self.assertEqual(len(testset_list), 1)
self.assertIn("path", testset_list[0]["config"]) self.assertIn("path", testset_list[0]["config"])
self.assertEqual(testset_list[0]["config"]["path"], path) self.assertEqual(testset_list[0]["config"]["path"], path)
@@ -565,7 +565,7 @@ class TestcaseParserUnittest(unittest.TestCase):
# relative file path # relative file path
path = 'tests/data/demo_testset_hardcode.yml' path = 'tests/data/demo_testset_hardcode.yml'
testset_list = testcase.load_testcases_by_path(path) testset_list = testcase.load_testsets_by_path(path)
self.assertEqual(len(testset_list), 1) self.assertEqual(len(testset_list), 1)
self.assertIn("path", testset_list[0]["config"]) self.assertIn("path", testset_list[0]["config"])
self.assertIn(path, testset_list[0]["config"]["path"]) self.assertIn(path, testset_list[0]["config"]["path"])
@@ -577,7 +577,7 @@ class TestcaseParserUnittest(unittest.TestCase):
os.path.join(os.getcwd(), 'tests/data/demo_testset_hardcode.json'), os.path.join(os.getcwd(), 'tests/data/demo_testset_hardcode.json'),
'tests/data/demo_testset_hardcode.yml' 'tests/data/demo_testset_hardcode.yml'
] ]
testset_list = testcase.load_testcases_by_path(path) testset_list = testcase.load_testsets_by_path(path)
self.assertEqual(len(testset_list), 2) self.assertEqual(len(testset_list), 2)
self.assertEqual(len(testset_list[0]["testcases"]), 3) self.assertEqual(len(testset_list[0]["testcases"]), 3)
self.assertEqual(len(testset_list[1]["testcases"]), 3) self.assertEqual(len(testset_list[1]["testcases"]), 3)
@@ -594,12 +594,12 @@ class TestcaseParserUnittest(unittest.TestCase):
def test_load_testcases_by_path_folder(self): def test_load_testcases_by_path_folder(self):
# absolute folder path # absolute folder path
path = os.path.join(os.getcwd(), 'tests/data') path = os.path.join(os.getcwd(), 'tests/data')
testset_list_1 = testcase.load_testcases_by_path(path) testset_list_1 = testcase.load_testsets_by_path(path)
self.assertGreater(len(testset_list_1), 4) self.assertGreater(len(testset_list_1), 4)
# relative folder path # relative folder path
path = 'tests/data/' path = 'tests/data/'
testset_list_2 = testcase.load_testcases_by_path(path) testset_list_2 = testcase.load_testsets_by_path(path)
self.assertEqual(len(testset_list_1), len(testset_list_2)) self.assertEqual(len(testset_list_1), len(testset_list_2))
# list/set container with file(s) # list/set container with file(s)
@@ -607,18 +607,18 @@ class TestcaseParserUnittest(unittest.TestCase):
os.path.join(os.getcwd(), 'tests/data'), os.path.join(os.getcwd(), 'tests/data'),
'tests/data/' 'tests/data/'
] ]
testset_list_3 = testcase.load_testcases_by_path(path) testset_list_3 = testcase.load_testsets_by_path(path)
self.assertEqual(len(testset_list_3), 2 * len(testset_list_1)) self.assertEqual(len(testset_list_3), 2 * len(testset_list_1))
def test_load_testcases_by_path_not_exist(self): def test_load_testcases_by_path_not_exist(self):
# absolute folder path # absolute folder path
path = os.path.join(os.getcwd(), 'tests/data_not_exist') path = os.path.join(os.getcwd(), 'tests/data_not_exist')
testset_list_1 = testcase.load_testcases_by_path(path) testset_list_1 = testcase.load_testsets_by_path(path)
self.assertEqual(testset_list_1, []) self.assertEqual(testset_list_1, [])
# relative folder path # relative folder path
path = 'tests/data_not_exist' path = 'tests/data_not_exist'
testset_list_2 = testcase.load_testcases_by_path(path) testset_list_2 = testcase.load_testsets_by_path(path)
self.assertEqual(testset_list_2, []) self.assertEqual(testset_list_2, [])
# list/set container with file(s) # list/set container with file(s)
@@ -626,13 +626,13 @@ class TestcaseParserUnittest(unittest.TestCase):
os.path.join(os.getcwd(), 'tests/data_not_exist'), os.path.join(os.getcwd(), 'tests/data_not_exist'),
'tests/data_not_exist/' 'tests/data_not_exist/'
] ]
testset_list_3 = testcase.load_testcases_by_path(path) testset_list_3 = testcase.load_testsets_by_path(path)
self.assertEqual(testset_list_3, []) self.assertEqual(testset_list_3, [])
def test_load_testcases_by_path_layered(self): def test_load_testcases_by_path_layered(self):
path = os.path.join( path = os.path.join(
os.getcwd(), 'tests/data/demo_testset_layer.yml') os.getcwd(), 'tests/data/demo_testset_layer.yml')
testsets_list = testcase.load_testcases_by_path(path) testsets_list = testcase.load_testsets_by_path(path)
self.assertIn("variables", testsets_list[0]["config"]) self.assertIn("variables", testsets_list[0]["config"])
self.assertIn("request", testsets_list[0]["config"]) self.assertIn("request", testsets_list[0]["config"])
self.assertIn("request", testsets_list[0]["testcases"][0]) self.assertIn("request", testsets_list[0]["testcases"][0])