From f2034426d54e2e9e6f68524de545673ab2f6898d Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 2 Jun 2020 14:13:14 +0800 Subject: [PATCH] change: builtin comparator equal --- httprunner/builtin/comparators.py | 2 +- httprunner/response.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/httprunner/builtin/comparators.py b/httprunner/builtin/comparators.py index 975c868d..8a0f1485 100644 --- a/httprunner/builtin/comparators.py +++ b/httprunner/builtin/comparators.py @@ -5,7 +5,7 @@ Built-in validate comparators. import re -def equals(check_value, expect_value): +def equal(check_value, expect_value): assert check_value == expect_value diff --git a/httprunner/response.py b/httprunner/response.py index 806d7f86..7733b90c 100644 --- a/httprunner/response.py +++ b/httprunner/response.py @@ -12,8 +12,8 @@ from httprunner.schema import VariablesMapping, Validators, FunctionsMapping def get_uniform_comparator(comparator: Text): """ convert comparator alias to uniform name """ - if comparator in ["eq", "equals", "==", "is"]: - return "equals" + if comparator in ["eq", "equals", "equal"]: + return "equal" elif comparator in ["lt", "less_than"]: return "less_than" elif comparator in ["le", "less_than_or_equals"]: @@ -62,8 +62,8 @@ def uniform_validator(validator): validator (dict): validator maybe in two formats: format1: this is kept for compatibility with the previous versions. - {"check": "status_code", "assert": "eq", "expect": 201} - {"check": "$resp_body_success", "assert": "eq", "expect": True} + {"check": "status_code", "comparator": "eq", "expect": 201} + {"check": "$resp_body_success", "comparator": "eq", "expect": True} format2: recommended new version, {assert: [check_item, expected_value]} {'eq': ['status_code', 201]} {'eq': ['$resp_body_success', True]}