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

move HttpNtlmAuth from runner to client

Browse Source
This commit is contained in:
debugtalk
2017-07-03 12:13:56 +08:00
parent ba64e82947
commit f32578bbb8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ate/client.py
View File

@@ -97,6 +97,12 @@ class HttpSession(requests.Session):
request_meta["method"] = method request_meta["method"] = method
request_meta["start_time"] = time.time() request_meta["start_time"] = time.time()
if "HttpNtlmAuth" in kwargs:
from requests_ntlm import HttpNtlmAuth
auth_account = kwargs.pop("HttpNtlmAuth")
kwargs["auth"] = HttpNtlmAuth(
auth_account["username"], auth_account["password"])
response = self._send_request_safe_mode(method, url, **kwargs) response = self._send_request_safe_mode(method, url, **kwargs)
request_meta["url"] = (response.history and response.history[0] or response)\ request_meta["url"] = (response.history and response.history[0] or response)\
.request.path_url .request.path_url

6
ate/runner.py
View File

@@ -78,12 +78,6 @@ class TestRunner(object):
except KeyError: except KeyError:
raise exception.ParamsError("URL or METHOD missed!") raise exception.ParamsError("URL or METHOD missed!")
if "HttpNtlmAuth" in parsed_request:
from requests_ntlm import HttpNtlmAuth
auth_account = parsed_request.pop("HttpNtlmAuth")
parsed_request["auth"] = HttpNtlmAuth(
auth_account["username"], auth_account["password"])
resp = self.client.request(url=url, method=method, **parsed_request) resp = self.client.request(url=url, method=method, **parsed_request)
resp_obj = response.ResponseObject(resp) resp_obj = response.ResponseObject(resp)