From 9a7bccb52f58a86fd411c39363813354934c55e4 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 3 Nov 2019 15:49:08 +0800 Subject: [PATCH 1/3] change: format code, two blank lines between function --- httprunner/built_in.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/httprunner/built_in.py b/httprunner/built_in.py index 821304ca..792fe638 100644 --- a/httprunner/built_in.py +++ b/httprunner/built_in.py @@ -30,6 +30,7 @@ def gen_random_string(str_len): return ''.join( random.choice(string.ascii_letters + string.digits) for _ in range(str_len)) + def get_timestamp(str_len=13): """ get timestamp string, length can only between 0 and 16 """ @@ -38,6 +39,7 @@ def get_timestamp(str_len=13): raise ParamsError("timestamp length can only between 0 and 16.") + def get_current_date(fmt="%Y-%m-%d"): """ get current date, default format is %Y-%m-%d """ @@ -66,6 +68,7 @@ def get_current_date(fmt="%Y-%m-%d"): def multipart_encoder(**kwargs): """ initialize MultipartEncoder with uploading fields. """ + def get_filetype(file_path): file_type = filetype.guess(file_path) if file_type: @@ -108,52 +111,66 @@ def multipart_content_type(multipart_encoder): def equals(check_value, expect_value): assert check_value == expect_value + def less_than(check_value, expect_value): assert check_value < expect_value + def less_than_or_equals(check_value, expect_value): assert check_value <= expect_value + def greater_than(check_value, expect_value): assert check_value > expect_value + def greater_than_or_equals(check_value, expect_value): assert check_value >= expect_value + def not_equals(check_value, expect_value): assert check_value != expect_value + def string_equals(check_value, expect_value): assert builtin_str(check_value) == builtin_str(expect_value) + def length_equals(check_value, expect_value): assert isinstance(expect_value, integer_types) assert len(check_value) == expect_value + def length_greater_than(check_value, expect_value): assert isinstance(expect_value, integer_types) assert len(check_value) > expect_value + def length_greater_than_or_equals(check_value, expect_value): assert isinstance(expect_value, integer_types) assert len(check_value) >= expect_value + def length_less_than(check_value, expect_value): assert isinstance(expect_value, integer_types) assert len(check_value) < expect_value + def length_less_than_or_equals(check_value, expect_value): assert isinstance(expect_value, integer_types) assert len(check_value) <= expect_value + def contains(check_value, expect_value): assert isinstance(check_value, (list, tuple, dict, basestring)) assert expect_value in check_value + def contained_by(check_value, expect_value): assert isinstance(expect_value, (list, tuple, dict, basestring)) assert check_value in expect_value + def type_match(check_value, expect_value): def get_type(name): if isinstance(name, type): @@ -168,19 +185,24 @@ def type_match(check_value, expect_value): assert isinstance(check_value, get_type(expect_value)) + def regex_match(check_value, expect_value): assert isinstance(expect_value, basestring) assert isinstance(check_value, basestring) assert re.match(expect_value, check_value) + def startswith(check_value, expect_value): assert builtin_str(check_value).startswith(builtin_str(expect_value)) + def endswith(check_value, expect_value): assert builtin_str(check_value).endswith(builtin_str(expect_value)) + """ built-in hooks """ + def sleep_N_secs(n_secs): """ sleep n seconds """ From 36ebe221f1db7c5ecf9ca8ff5827b03027c443d3 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 3 Nov 2019 15:54:59 +0800 Subject: [PATCH 2/3] change: rename builtin function, sleep_N_secs => sleep --- httprunner/built_in.py | 15 ++++++--------- tests/test_runner.py | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/httprunner/built_in.py b/httprunner/built_in.py index 792fe638..43524d3f 100644 --- a/httprunner/built_in.py +++ b/httprunner/built_in.py @@ -46,6 +46,12 @@ def get_current_date(fmt="%Y-%m-%d"): return datetime.datetime.now().strftime(fmt) +def sleep(n_secs): + """ sleep n seconds + """ + time.sleep(n_secs) + + ############################################################################### ## upload files with requests-toolbelt # e.g. @@ -198,12 +204,3 @@ def startswith(check_value, expect_value): def endswith(check_value, expect_value): assert builtin_str(check_value).endswith(builtin_str(expect_value)) - - -""" built-in hooks -""" - -def sleep_N_secs(n_secs): - """ sleep n seconds - """ - time.sleep(n_secs) diff --git a/tests/test_runner.py b/tests/test_runner.py index df8c734d..2bc6fc8b 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -52,11 +52,11 @@ class TestRunner(ApiServerUnittest): "name": "basic test with httpbin", "base_url": HTTPBIN_SERVER, "setup_hooks": [ - "${sleep_N_secs(0.5)}", + "${sleep(0.5)}", "${hook_print(setup)}" ], "teardown_hooks": [ - "${sleep_N_secs(1)}", + "${sleep(1)}", "${hook_print(teardown)}" ] }, From b04e21b81b74b77173a32b994c4728449bc07950 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 3 Nov 2019 16:06:09 +0800 Subject: [PATCH 3/3] doc: add FAQ, HTTPS SSLError #394 --- docs/FAQ.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/FAQ.md b/docs/FAQ.md index b43101d1..782cb020 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -1 +1,14 @@ # 常见问题 + +## HTTPS SSLError + +请求 HTTPS 接口时，若本地开启了代理软件（Charles/Fiddler），由于 HTTPS 证书的原因，会导致 SSLError 的报错。 + +解决的方式是，在 config 中增加 `verify: False`，原理见 requests 的 [`SSL Cert Verification`](https://requests.kennethreitz.org/en/master/user/advanced/#ssl-cert-verification) 部分。 + +```yaml +config: + name: XXX + base_url: XXX + verify: False +```