From 52bc344f666c2dc2f6cce26095c3b1378b6ee6ed Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sat, 24 Jun 2017 19:44:40 +0800 Subject: [PATCH] gen_md5: pass in *args --- ate/utils.py | 5 ++--- test/api_server.py | 2 +- test/base.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ate/utils.py b/ate/utils.py index 6f0ff6d0..1add62d5 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -19,9 +19,8 @@ def gen_random_string(str_len): return ''.join( random.choice(string.ascii_letters + string.digits) for _ in range(str_len)) -def gen_md5(str_list): - authorization_str = "".join(str_list) - return hashlib.md5(authorization_str.encode('utf-8')).hexdigest() +def gen_md5(*str_args): + return hashlib.md5("".join(str_args).encode('utf-8')).hexdigest() def handle_req_data(data): diff --git a/test/api_server.py b/test/api_server.py index f67b2db3..b0cdd87f 100644 --- a/test/api_server.py +++ b/test/api_server.py @@ -37,7 +37,7 @@ def validate_request(func): req_authorization = req_headers['Authorization'] random_str = req_headers['Random'] 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 return func(*args, **kwds) except (KeyError, AssertionError): diff --git a/test/base.py b/test/base.py index 2f5d70fb..3368bc21 100644 --- a/test/base.py +++ b/test/base.py @@ -29,7 +29,7 @@ class ApiServerUnittest(unittest.TestCase): token = api_server.TOKEN data = utils.handle_req_data(data) random_str = utils.gen_random_string(5) - authorization = utils.gen_md5([token, data, random_str]) + authorization = utils.gen_md5(token, data, random_str) headers = { 'authorization': authorization,