GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-28 11:36:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix unittest 31dcc40233

Browse Source
This commit is contained in:
debugtalk
2018-12-17 23:08:35 +08:00
parent b87740a33c
commit ab3fe57c68
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/data/demo_parameters.yml
+1 -1
View File
@@ -17,7 +17,7 @@
- test: - test:
name: get token with $user_agent and $username name: get token with $user_agent and $username
api: get_token api: api/get_token.yml
extract: extract:
- token: content.token - token: content.token
validate: validate:
tests/data/demo_testcase_layer.yml
+13 -13
View File
@@ -11,7 +11,7 @@
- test: - test:
name: get token with $user_agent, $app_version name: get token with $user_agent, $app_version
api: get_token api: api/get_token.yml
extract: extract:
- token: content.token - token: content.token
validate: validate:
@@ -21,7 +21,7 @@
- test: - test:
name: reset all users name: reset all users
api: reset_all api: api/reset_all.yml
variables: variables:
token: $token token: $token
validate: validate:
@@ -30,7 +30,7 @@
- test: - test:
name: get user that does not exist name: get user that does not exist
api: get_user api: api/get_user.yml
variables: variables:
uid: 1000 uid: 1000
token: $token token: $token
@@ -45,14 +45,14 @@
user_name: "user1" user_name: "user1"
user_password: "123456" user_password: "123456"
token: $token token: $token
api: create_user api: api/create_user.yml
validate: validate:
- {"check": "status_code", "expect": 201} - {"check": "status_code", "expect": 201}
- {"check": "content.success", "expect": true} - {"check": "content.success", "expect": true}
- test: - test:
name: get user that has been created name: get user that has been created
api: get_user api: api/get_user.yml
variables: variables:
uid: 1000 uid: 1000
token: $token token: $token
@@ -68,7 +68,7 @@
user_name: "user1" user_name: "user1"
user_password: "123456" user_password: "123456"
token: $token token: $token
api: create_user api: api/create_user.yml
validate: validate:
- {"check": "status_code", "expect": 500} - {"check": "status_code", "expect": 500}
- {"check": "content.success", "expect": false} - {"check": "content.success", "expect": false}
@@ -80,14 +80,14 @@
user_name: "user1" user_name: "user1"
user_password: "654321" user_password: "654321"
token: $token token: $token
api: update_user api: api/update_user.yml
validate: validate:
- {"check": "status_code", "expect": 200} - {"check": "status_code", "expect": 200}
- {"check": "content.success", "expect": true} - {"check": "content.success", "expect": true}
- test: - test:
name: get user that has been updated name: get user that has been updated
api: get_user api: api/get_user.yml
variables: variables:
uid: 1000 uid: 1000
token: $token token: $token
@@ -98,7 +98,7 @@
- test: - test:
name: get users name: get users
api: get_users api: api/get_users.yml
variables: variables:
token: $token token: $token
validate: validate:
@@ -107,7 +107,7 @@
- test: - test:
name: delete user that exists name: delete user that exists
api: delete_user api: api/delete_user.yml
variables: variables:
uid: 1000 uid: 1000
token: $token token: $token
@@ -117,7 +117,7 @@
- test: - test:
name: get users name: get users
api: get_users api: api/get_users.yml
variables: variables:
token: $token token: $token
validate: validate:
@@ -131,14 +131,14 @@
user_name: "user1" user_name: "user1"
user_password: "123456" user_password: "123456"
token: $token token: $token
api: create_user api: api/create_user.yml
validate: validate:
- {"check": "status_code", "expect": 201} - {"check": "status_code", "expect": 201}
- {"check": "content.success", "expect": true} - {"check": "content.success", "expect": true}
- test: - test:
name: get users name: get users
api: get_users api: api/get_users.yml
variables: variables:
token: $token token: $token
validate: validate:
tests/test_loader.py
+5 -5
View File
@@ -438,12 +438,12 @@ class TestSuiteLoader(unittest.TestCase):
def test_load_api_folder(self): def test_load_api_folder(self):
path = os.path.join(os.getcwd(), "tests", "api") path = os.path.join(os.getcwd(), "tests", "api")
api_definition_mapping = loader.load_api_folder(path) api_definition_mapping = loader.load_api_folder(path)
self.assertIn("get_token", api_definition_mapping) api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml")
self.assertIn("request", api_definition_mapping["get_token"]) self.assertIn(api_file_path, api_definition_mapping)
api_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml") self.assertIn("request", api_definition_mapping[api_file_path])
self.assertIn(api_path, api_definition_mapping)
def test_load_project_tests(self): def test_load_project_tests(self):
loader.load_project_tests(os.path.join(os.getcwd(), "tests")) loader.load_project_tests(os.path.join(os.getcwd(), "tests"))
self.assertIn("get_token", self.tests_def_mapping["api"]) api_file_path = os.path.join(os.getcwd(), "tests", "api", "get_token.yml")
self.assertIn(api_file_path, self.tests_def_mapping["api"])
self.assertEqual(self.project_mapping["env"]["PROJECT_KEY"], "ABCDEFGH") self.assertEqual(self.project_mapping["env"]["PROJECT_KEY"], "ABCDEFGH")
tests/test_parser.py
+1 -1
View File
@@ -628,7 +628,7 @@ class TestParser(unittest.TestCase):
raw_testinfo = { raw_testinfo = {
"name": "get token", "name": "get token",
"base_url": "https://debugtalk.com", "base_url": "https://debugtalk.com",
"api": "get_token", "api": "api/get_token.yml",
} }
api_def_dict = loader.load_teststep(raw_testinfo) api_def_dict = loader.load_teststep(raw_testinfo)
test_block = { test_block = {