gen_md5: pass in *args

This commit is contained in:
httprunner
2017-06-24 19:44:40 +08:00
parent dc7d14439d
commit e81d682c50
3 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -19,9 +19,8 @@ def gen_random_string(str_len):
return ''.join( return ''.join(
random.choice(string.ascii_letters + string.digits) for _ in range(str_len)) random.choice(string.ascii_letters + string.digits) for _ in range(str_len))
def gen_md5(str_list): def gen_md5(*str_args):
authorization_str = "".join(str_list) return hashlib.md5("".join(str_args).encode('utf-8')).hexdigest()
return hashlib.md5(authorization_str.encode('utf-8')).hexdigest()
def handle_req_data(data): def handle_req_data(data):
+1 -1
View File
@@ -37,7 +37,7 @@ def validate_request(func):
req_authorization = req_headers['Authorization'] req_authorization = req_headers['Authorization']
random_str = req_headers['Random'] random_str = req_headers['Random']
data = utils.handle_req_data(request.data) data = utils.handle_req_data(request.data)
authorization = utils.gen_md5([TOKEN, data, random_str]) authorization = utils.gen_md5(TOKEN, data, random_str)
assert authorization == req_authorization assert authorization == req_authorization
return func(*args, **kwds) return func(*args, **kwds)
except (KeyError, AssertionError): except (KeyError, AssertionError):
+1 -1
View File
@@ -29,7 +29,7 @@ class ApiServerUnittest(unittest.TestCase):
token = api_server.TOKEN token = api_server.TOKEN
data = utils.handle_req_data(data) data = utils.handle_req_data(data)
random_str = utils.gen_random_string(5) random_str = utils.gen_random_string(5)
authorization = utils.gen_md5([token, data, random_str]) authorization = utils.gen_md5(token, data, random_str)
headers = { headers = {
'authorization': authorization, 'authorization': authorization,