GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-18 10:47:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3 feat: support teststep variables

Browse Source
This commit is contained in:
debugtalk
2020-04-20 12:03:08 +08:00
parent 4e4f281197
commit aa903deb97
5 changed files with 145 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
httprunner/v3/parser.py
View File

@@ -101,7 +101,7 @@ def parse_string_variables(content, variables_mapping):
variable_value = variables_mapping[variable_name]
# TODO: replace variable label from $var to {{var}}
if "${}".format(variable_name) == content:
if f"${variable_name}" == content:
# content is a variable
content = variable_value
else:
@@ -110,7 +110,7 @@ def parse_string_variables(content, variables_mapping):
variable_value = str(variable_value)
content = content.replace(
"${}".format(variable_name),
f"${variable_name}",
variable_value, 1
)

17
httprunner/v3/runner.py
View File

@@ -3,7 +3,7 @@ from typing import List
import requests
from loguru import logger
from httprunner.v3.parser import build_url
from httprunner.v3.parser import build_url, parse_content
from httprunner.v3.response import ResponseObject
from httprunner.v3.schema import TestsConfig, TestStep
@@ -25,20 +25,23 @@ class TestCaseRunner(object):
def run_step(self, step):
logger.info(f"run step: {step.name}")
# prepare arguments
# parse
request_dict = step.request.dict()
method = request_dict.pop("method")
url_path = request_dict.pop("url")
parsed_request_dict = parse_content(request_dict, step.variables)
# prepare arguments
method = parsed_request_dict.pop("method")
url_path = parsed_request_dict.pop("url")
url = build_url(self.config.base_url, url_path)
request_dict["json"] = request_dict.pop("req_json", {})
parsed_request_dict["json"] = parsed_request_dict.pop("req_json", {})
logger.info(f"{method} {url}")
logger.debug(f"request kwargs(raw): {request_dict}")
logger.debug(f"request kwargs(raw): {parsed_request_dict}")
# request
session = self.session or requests.Session()
resp = session.request(method, url, **request_dict)
resp = session.request(method, url, **parsed_request_dict)
resp_obj = ResponseObject(resp)
# validate