GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-30 12:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: code format

Browse Source
This commit is contained in:
debugtalk
2019-12-01 15:49:10 +08:00
parent 6e8ce1fba5
commit bc9c69956e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
httprunner/validator.py
View File

@@ -159,13 +159,13 @@ def get_uniform_comparator(comparator):
return "length_equals" return "length_equals"
elif comparator in ["len_gt", "count_gt", "length_greater_than", "count_greater_than"]: elif comparator in ["len_gt", "count_gt", "length_greater_than", "count_greater_than"]:
return "length_greater_than" return "length_greater_than"
elif comparator in ["len_ge", "count_ge", "length_greater_than_or_equals", \ elif comparator in ["len_ge", "count_ge", "length_greater_than_or_equals",
"count_greater_than_or_equals"]: "count_greater_than_or_equals"]:
return "length_greater_than_or_equals" return "length_greater_than_or_equals"
elif comparator in ["len_lt", "count_lt", "length_less_than", "count_less_than"]: elif comparator in ["len_lt", "count_lt", "length_less_than", "count_less_than"]:
return "length_less_than" return "length_less_than"
elif comparator in ["len_le", "count_le", "length_less_than_or_equals", \ elif comparator in ["len_le", "count_le", "length_less_than_or_equals",
"count_less_than_or_equals"]: "count_less_than_or_equals"]:
return "length_less_than_or_equals" return "length_less_than_or_equals"
else: else:
return comparator return comparator
@@ -237,14 +237,14 @@ def _convert_validators_to_mapping(validators):
Examples: Examples:
>>> validators = [ >>> validators = [
{"check": "v1", "expect": 201, "comparator": "eq"}, {"check": "v1", "expect": 201, "comparator": "eq"},
{"check": {"b": 1}, "expect": 200, "comparator": "eq"} {"check": {"b": 1}, "expect": 200, "comparator": "eq"}
] ]
>>> _convert_validators_to_mapping(validators) >>> print(_convert_validators_to_mapping(validators))
{ {
("v1", "eq"): {"check": "v1", "expect": 201, "comparator": "eq"}, ("v1", "eq"): {"check": "v1", "expect": 201, "comparator": "eq"},
('{"b": 1}', "eq"): {"check": {"b": 1}, "expect": 200, "comparator": "eq"} ('{"b": 1}', "eq"): {"check": {"b": 1}, "expect": 200, "comparator": "eq"}
} }
""" """
validators_mapping = {} validators_mapping = {}

1
tests/test_validator.py
View File

@@ -117,7 +117,6 @@ class TestValidator(unittest.TestCase):
{"check": "status_code", "comparator": "equals", "expect": 201} {"check": "status_code", "comparator": "equals", "expect": 201}
) )
def test_extend_validators(self): def test_extend_validators(self):
def_validators = [ def_validators = [
{'eq': ['v1', 200]}, {'eq': ['v1', 200]},