GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-09 22:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/httprunner/HttpRunner

Browse Source
This commit is contained in:
httprunner
2018-08-30 16:21:33 +08:00
parent 4532fa83ab c3bca73d6b
commit 90ff73738c
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
httprunner/__about__.py
View File

@@ -1,7 +1,7 @@
__title__ = 'HttpRunner' __title__ = 'HttpRunner'
__description__ = 'One-stop solution for HTTP(S) testing.' __description__ = 'One-stop solution for HTTP(S) testing.'
__url__ = 'https://github.com/HttpRunner/HttpRunner' __url__ = 'https://github.com/HttpRunner/HttpRunner'
__version__ = '1.5.11' __version__ = '1.5.12'
__author__ = 'debugtalk' __author__ = 'debugtalk'
__author_email__ = 'mail@debugtalk.com' __author_email__ = 'mail@debugtalk.com'
__license__ = 'MIT' __license__ = 'MIT'

7
httprunner/context.py
View File

@@ -230,6 +230,7 @@ class Context(object):
logger.log_info("start to validate.") logger.log_info("start to validate.")
validate_pass = True validate_pass = True
failures = []
for validator in validators: for validator in validators:
# evaluate validators with context variable mapping. # evaluate validators with context variable mapping.
@@ -240,12 +241,14 @@ class Context(object):
try: try:
self._do_validation(evaluated_validator) self._do_validation(evaluated_validator)
except exceptions.ValidationFailure: except exceptions.ValidationFailure as ex:
validate_pass = False validate_pass = False
failures.append(str(ex))
evaluated_validators.append(evaluated_validator) evaluated_validators.append(evaluated_validator)
if not validate_pass: if not validate_pass:
raise exceptions.ValidationFailure failures_string = "\n".join([failure for failure in failures])
raise exceptions.ValidationFailure(failures_string)
return evaluated_validators return evaluated_validators

3
httprunner/runner.py
View File

@@ -214,8 +214,7 @@ class Runner(object):
# validate # validate
try: try:
self.evaluated_validators = self.context.validate(validators, resp_obj) self.evaluated_validators = self.context.validate(validators, resp_obj)
except (exceptions.ParamsError, \ except (exceptions.ParamsError, exceptions.ValidationFailure, exceptions.ExtractFailure):
exceptions.ValidationFailure, exceptions.ExtractFailure):
# log request # log request
err_req_msg = "request: \n" err_req_msg = "request: \n"
err_req_msg += "headers: {}\n".format(parsed_request.pop("headers", {})) err_req_msg += "headers: {}\n".format(parsed_request.pop("headers", {}))

2
httprunner/utils.py
View File

@@ -263,7 +263,7 @@ def add_teststep(test_runner, teststep_dict):
try: try:
test_runner.run_test(teststep_dict) test_runner.run_test(teststep_dict)
except exceptions.MyBaseFailure as ex: except exceptions.MyBaseFailure as ex:
self.fail(repr(ex)) self.fail(str(ex))
finally: finally:
if hasattr(test_runner.http_client_session, "meta_data"): if hasattr(test_runner.http_client_session, "meta_data"):
self.meta_data = test_runner.http_client_session.meta_data self.meta_data = test_runner.http_client_session.meta_data

3
tests/data/test.env Normal file
View File

@@ -0,0 +1,3 @@
UserName=test
Password=654321
PROJECT_KEY=AAABBBCCC