Merge pull request #3 from debugtalk/master

lastest  pull from debugtalk
This commit is contained in:
firefoxwang
2017-11-01 20:14:38 +08:00
committed by GitHub
24 changed files with 216 additions and 96 deletions

View File

@@ -10,7 +10,7 @@
app_version: $app_version
json:
sign: ${get_sign($user_agent, $device_sn, $os_platform, $app_version)}
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 200}
- {"check": "content.token", "comparator": "len_eq", "expected": 16}

View File

@@ -16,12 +16,12 @@
"sign": "f1219719911caae89ccc301679857ebfda115ca2"
}
},
"extractors": [
"extract": [
{
"token": "content.token"
}
],
"validators": [
"validate": [
{"check": "status_code", "comparator": "eq", "expected": 200},
{"check": "content.token", "comparator": "len_eq", "expected": 16}
]
@@ -43,7 +43,7 @@
"password": "123456"
}
},
"validators": [
"validate": [
{"check": "status_code", "comparator": "eq", "expected": 201},
{"check": "content.success", "comparator": "eq", "expected": true}
]
@@ -65,7 +65,7 @@
"password": "123456"
}
},
"validators": [
"validate": [
{"check": "status_code", "comparator": "eq", "expected": 500},
{"check": "content.success", "comparator": "eq", "expected": false}
]

View File

@@ -11,9 +11,9 @@
app_version: '2.8.6'
json:
sign: f1219719911caae89ccc301679857ebfda115ca2
extractors:
extract:
- token: content.token
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 200}
- {"check": "content.token", "comparator": "len_eq", "expected": 16}
@@ -29,7 +29,7 @@
json:
name: "user1"
password: "123456"
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 201}
- {"check": "content.success", "comparator": "eq", "expected": true}
@@ -45,6 +45,6 @@
json:
name: "user1"
password: "123456"
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 500}
- {"check": "content.success", "comparator": "eq", "expected": false}

View File

@@ -16,20 +16,20 @@
- test:
name: get token
api: get_token($user_agent, $device_sn, $os_platform, $app_version)
extractors:
extract:
- token: content.token
- test:
name: reset all users
api: reset_all($token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.success", "expected": true}
- test:
name: get user that does not exist
api: get_user(1000, $token)
validators:
validate:
- {"check": "status_code", "expected": 404}
- {"check": "content.success", "expected": false}
@@ -39,14 +39,14 @@
- user_name: "user1"
- user_password: "123456"
api: create_user(1000, $user_name, $user_password, $token)
validators:
validate:
- {"check": "status_code", "expected": 201}
- {"check": "content.success", "expected": true}
- test:
name: get user that has been created
api: get_user(1000, $token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.success", "expected": true}
- {"check": "content.data.password", "expected": "123456"}
@@ -57,7 +57,7 @@
- user_name: "user1"
- user_password: "123456"
api: create_user(1000, $user_name, $user_password, $token)
validators:
validate:
- {"check": "status_code", "expected": 500}
- {"check": "content.success", "expected": false}
@@ -67,14 +67,14 @@
- user_name: "user1"
- user_password: "654321"
api: update_user(1000, $user_name, $user_password, $token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.success", "expected": true}
- test:
name: get user that has been updated
api: get_user(1000, $token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.success", "expected": true}
- {"check": "content.data.password", "expected": "654321"}
@@ -82,21 +82,21 @@
- test:
name: get users
api: get_users($token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.count", "expected": 1}
- test:
name: delete user that exists
api: delete_user(1000, $token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.success", "expected": true}
- test:
name: get users
api: get_users($token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.count", "expected": 0}
@@ -106,13 +106,13 @@
- user_name: "user1"
- user_password: "123456"
api: create_user(1000, $user_name, $user_password, $token)
validators:
validate:
- {"check": "status_code", "expected": 201}
- {"check": "content.success", "expected": true}
- test:
name: get users
api: get_users($token)
validators:
validate:
- {"check": "status_code", "expected": 200}
- {"check": "content.count", "expected": 1}

View File

@@ -25,9 +25,9 @@
app_version: $app_version
json:
sign: ${get_sign($user_agent, $device_sn, $os_platform, $app_version)}
extractors:
extract:
- token: content.token
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 200}
- {"check": "content.token", "comparator": "len_eq", "expected": 16}
@@ -44,7 +44,7 @@
json:
name: $user_name
password: $user_password
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 201}
- {"check": "content.success", "comparator": "eq", "expected": true}
@@ -58,6 +58,6 @@
json:
name: "user1"
password: "123456"
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 500}
- {"check": "content.success", "comparator": "eq", "expected": false}

View File

@@ -35,9 +35,9 @@
app_version: $app_version
json:
sign: ${get_sign_lambda($user_agent, $device_sn, $os_platform, $app_version)}
extractors:
extract:
- token: content.token
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 200}
- {"check": "content.token", "comparator": "len_eq", "expected": 16}
@@ -54,7 +54,7 @@
json:
name: $user_name
password: $user_password
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 201}
- {"check": "content.success", "comparator": "eq", "expected": true}
@@ -68,6 +68,6 @@
json:
name: "user1"
password: "123456"
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 500}
- {"check": "content.success", "comparator": "eq", "expected": false}

View File

@@ -26,9 +26,9 @@
app_version: $app_version
json:
sign: $sign
extractors:
extract:
- token: content.token
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 200}
- {"check": "content.token", "comparator": "len_eq", "expected": 16}
@@ -45,7 +45,7 @@
json:
name: $user_name
password: $user_password
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 201}
- {"check": "content.success", "comparator": "eq", "expected": true}
@@ -59,6 +59,6 @@
json:
name: "user1"
password: "123456"
validators:
validate:
- {"check": "status_code", "comparator": "eq", "expected": 500}
- {"check": "content.success", "comparator": "eq", "expected": false}

View File

@@ -149,6 +149,55 @@ class TestResponse(ApiServerUnittest):
"abc"
)
def test_extract_text_response(self):
resp = requests.post(
url="http://127.0.0.1:5000/customize-response",
json={
'headers': {
'Content-Type': "application/json"
},
'body': "LB123abcRB789"
}
)
extract_binds_list = [
{"resp_content_key1": "LB123(.*)RB789"},
{"resp_content_key2": "LB[\d]*(.*)RB[\d]*"},
{"resp_content_key3": "LB[\d]*(.*)9"}
]
resp_obj = response.ResponseObject(resp)
extract_binds_dict = resp_obj.extract_response(extract_binds_list)
self.assertEqual(
extract_binds_dict["resp_content_key1"],
"abc"
)
self.assertEqual(
extract_binds_dict["resp_content_key2"],
"abc"
)
self.assertEqual(
extract_binds_dict["resp_content_key3"],
"abcRB78"
)
def test_extract_text_response_exception(self):
resp = requests.post(
url="http://127.0.0.1:5000/customize-response",
json={
'headers': {
'Content-Type': "application/json"
},
'body': "LB123abcRB789"
}
)
extract_binds_list = [
{"resp_content_key1": "LB123.*RB789"}
]
resp_obj = response.ResponseObject(resp)
with self.assertRaises(exception.ParamsError):
resp_obj.extract_response(extract_binds_list)
def test_extract_response_empty(self):
resp = requests.post(
url="http://127.0.0.1:5000/customize-response",
@@ -174,7 +223,7 @@ class TestResponse(ApiServerUnittest):
{"resp_content_body": "content.abc"}
]
resp_obj = response.ResponseObject(resp)
with self.assertRaises(exception.ResponseError):
with self.assertRaises(exception.ParamsError):
resp_obj.extract_response(extract_binds_list)
def test_validate(self):

View File

@@ -53,10 +53,10 @@ class TestRunner(ApiServerUnittest):
"sign": "f1219719911caae89ccc301679857ebfda115ca2"
}
},
"extractors": [
"extract": [
{"token": "content.token"}
],
"validators": [
"validate": [
{"check": "status_code", "comparator": "eq", "expected": 205},
{"check": "content.token", "comparator": "len_eq", "expected": 19}
]

View File

@@ -421,7 +421,7 @@ class TestcaseParserUnittest(unittest.TestCase):
self.assertIn("request", testsets_list[0]["config"])
self.assertIn("request", testsets_list[0]["testcases"][0])
self.assertIn("url", testsets_list[0]["testcases"][0]["request"])
self.assertIn("validators", testsets_list[0]["testcases"][0])
self.assertIn("validate", testsets_list[0]["testcases"][0])
def test_substitute_variables_with_mapping(self):
content = {