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

rename function name, resolve conflict with unittest

Browse Source
This commit is contained in:
debugtalk
2017-11-02 13:32:51 +08:00
parent 6e65f5cf0c
commit 9d50b1635c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ate/testcase.py
+6 -6
View File
@@ -19,7 +19,7 @@ test_def_overall_dict = {
testcases_cache_mapping = {} testcases_cache_mapping = {}
def load_yaml_file(yaml_file): def _load_yaml_file(yaml_file):
""" load yaml file and check file content format """ load yaml file and check file content format
""" """
with codecs.open(yaml_file, 'r+', encoding='utf-8') as stream: with codecs.open(yaml_file, 'r+', encoding='utf-8') as stream:
@@ -27,7 +27,7 @@ def load_yaml_file(yaml_file):
check_format(yaml_file, yaml_content) check_format(yaml_file, yaml_content)
return yaml_content return yaml_content
def load_json_file(json_file): def _load_json_file(json_file):
""" load json file and check file content format """ load json file and check file content format
""" """
with codecs.open(json_file, encoding='utf-8') as data_file: with codecs.open(json_file, encoding='utf-8') as data_file:
@@ -41,12 +41,12 @@ def load_json_file(json_file):
check_format(json_file, json_content) check_format(json_file, json_content)
return json_content return json_content
def load_tests(testcase_file_path): def _load_file(testcase_file_path):
file_suffix = os.path.splitext(testcase_file_path)[1] file_suffix = os.path.splitext(testcase_file_path)[1]
if file_suffix == '.json': if file_suffix == '.json':
return load_json_file(testcase_file_path) return _load_json_file(testcase_file_path)
elif file_suffix in ['.yaml', '.yml']: elif file_suffix in ['.yaml', '.yml']:
return load_yaml_file(testcase_file_path) return _load_yaml_file(testcase_file_path)
else: else:
# '' or other suffix # '' or other suffix
return [] return []
@@ -226,7 +226,7 @@ def load_test_file(file_path):
"api": {}, "api": {},
"testcases": [] "testcases": []
} }
tests_list = load_tests(file_path) tests_list = _load_file(file_path)
for item in tests_list: for item in tests_list:
for key in item: for key in item:
tests/test_context.py
+1 -1
View File
@@ -12,7 +12,7 @@ class VariableBindsUnittest(unittest.TestCase):
def setUp(self): def setUp(self):
self.context = Context() self.context = Context()
testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo_binds.yml') testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo_binds.yml')
self.testcases = testcase.load_tests(testcase_file_path) self.testcases = testcase._load_file(testcase_file_path)
def test_context_init_functions(self): def test_context_init_functions(self):
self.assertIn("get_timestamp", self.context.testset_functions_config) self.assertIn("get_timestamp", self.context.testset_functions_config)
tests/test_runner.py
+1 -1
View File
@@ -25,7 +25,7 @@ class TestRunner(ApiServerUnittest):
def test_run_single_testcase(self): def test_run_single_testcase(self):
for testcase_file_path in self.testcase_file_path_list: for testcase_file_path in self.testcase_file_path_list:
testcases = testcase.load_tests(testcase_file_path) testcases = testcase._load_file(testcase_file_path)
test = testcases[0]["test"] test = testcases[0]["test"]
self.assertTrue(self.test_runner._run_test(test)) self.assertTrue(self.test_runner._run_test(test))
tests/test_testcase.py
+8 -8
View File
@@ -10,12 +10,12 @@ class TestcaseParserUnittest(unittest.TestCase):
def test_load_testcases_bad_filepath(self): def test_load_testcases_bad_filepath(self):
testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo') testcase_file_path = os.path.join(os.getcwd(), 'tests/data/demo')
self.assertEqual(testcase.load_tests(testcase_file_path), []) self.assertEqual(testcase._load_file(testcase_file_path), [])
def test_load_json_testcases(self): def test_load_json_testcases(self):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'tests/data/demo_testset_hardcode.json') os.getcwd(), 'tests/data/demo_testset_hardcode.json')
testcases = testcase.load_tests(testcase_file_path) testcases = testcase._load_file(testcase_file_path)
self.assertEqual(len(testcases), 3) self.assertEqual(len(testcases), 3)
test = testcases[0]["test"] test = testcases[0]["test"]
self.assertIn('name', test) self.assertIn('name', test)
@@ -26,7 +26,7 @@ class TestcaseParserUnittest(unittest.TestCase):
def test_load_yaml_testcases(self): def test_load_yaml_testcases(self):
testcase_file_path = os.path.join( testcase_file_path = os.path.join(
os.getcwd(), 'tests/data/demo_testset_hardcode.yml') os.getcwd(), 'tests/data/demo_testset_hardcode.yml')
testcases = testcase.load_tests(testcase_file_path) testcases = testcase._load_file(testcase_file_path)
self.assertEqual(len(testcases), 3) self.assertEqual(len(testcases), 3)
test = testcases[0]["test"] test = testcases[0]["test"]
self.assertIn('name', test) self.assertIn('name', test)
@@ -41,7 +41,7 @@ class TestcaseParserUnittest(unittest.TestCase):
f.write("") f.write("")
with self.assertRaises(FileFormatError): with self.assertRaises(FileFormatError):
testcase.load_yaml_file(yaml_tmp_file) testcase._load_yaml_file(yaml_tmp_file)
os.remove(yaml_tmp_file) os.remove(yaml_tmp_file)
@@ -50,7 +50,7 @@ class TestcaseParserUnittest(unittest.TestCase):
f.write("abc") f.write("abc")
with self.assertRaises(FileFormatError): with self.assertRaises(FileFormatError):
testcase.load_yaml_file(yaml_tmp_file) testcase._load_yaml_file(yaml_tmp_file)
os.remove(yaml_tmp_file) os.remove(yaml_tmp_file)
@@ -61,7 +61,7 @@ class TestcaseParserUnittest(unittest.TestCase):
f.write("") f.write("")
with self.assertRaises(FileFormatError): with self.assertRaises(FileFormatError):
testcase.load_json_file(json_tmp_file) testcase._load_json_file(json_tmp_file)
os.remove(json_tmp_file) os.remove(json_tmp_file)
@@ -70,7 +70,7 @@ class TestcaseParserUnittest(unittest.TestCase):
f.write("{}") f.write("{}")
with self.assertRaises(FileFormatError): with self.assertRaises(FileFormatError):
testcase.load_json_file(json_tmp_file) testcase._load_json_file(json_tmp_file)
os.remove(json_tmp_file) os.remove(json_tmp_file)
@@ -79,7 +79,7 @@ class TestcaseParserUnittest(unittest.TestCase):
f.write("abc") f.write("abc")
with self.assertRaises(FileFormatError): with self.assertRaises(FileFormatError):
testcase.load_json_file(json_tmp_file) testcase._load_json_file(json_tmp_file)
os.remove(json_tmp_file) os.remove(json_tmp_file)