GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-26 02:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor api loading behavior: api should be located in /tests/api/ folder

Browse Source
This commit is contained in:
debugtalk
2017-09-21 20:54:06 +08:00
parent 495b8d97ab
commit 7aefc7a13b
5 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tests/data/api.yml → tests/api/demo.yml
View File

6
tests/test_testcase.py
View File

@@ -451,9 +451,7 @@ class TestcaseParserUnittest(unittest.TestCase):
self.assertEqual("", result["request"]["data"]["empty_str"])
def test_load_api_definition(self):
path = os.path.join(
os.getcwd(), 'tests/data')
api_dir_dict = testcase.load_api_definition(path)
api_dir_dict = testcase.load_api_definition()
self.assertIn("get_token", api_dir_dict)
self.assertEqual("/api/get-token", api_dir_dict["get_token"]["request"]["url"])
self.assertIn("$user_agent", api_dir_dict["get_token"]["function_meta"]["args"])
@@ -464,7 +462,7 @@ class TestcaseParserUnittest(unittest.TestCase):
os.getcwd(), 'tests/data')
api_info = testcase.get_api_definition("get_token", path)
self.assertEqual("/api/get-token", api_info["request"]["url"])
self.assertIn(path, testcase.api_overall_dict)
self.assertIn("get_token", testcase.api_overall_dict)
with self.assertRaises(ApiNotFound):
testcase.get_api_definition("api_not_exist", path)

8
tests/test_utils.py
View File

@@ -38,15 +38,15 @@ class TestUtils(ApiServerUnittest):
file1 = os.path.join(os.getcwd(), 'tests', 'test_utils.py')
file2 = os.path.join(os.getcwd(), 'tests', 'data', 'demo_binds.yml')
files = utils.load_folder_files(folder, file_type="test", recursive=False)
files = utils.load_folder_files(folder, recursive=False)
self.assertNotIn(file2, files)
files = utils.load_folder_files(folder, file_type="test", recursive=True)
files = utils.load_folder_files(folder)
self.assertIn(file2, files)
self.assertNotIn(file1, files)
files = utils.load_folder_files(folder, file_type="api", recursive=True)
api_file = os.path.join(os.getcwd(), 'tests', 'data', 'api.yml')
files = utils.load_folder_files(folder)
api_file = os.path.join(os.getcwd(), 'tests', 'api', 'demo.yml')
self.assertEqual(files[0], api_file)
def test_query_json(self):