From 822ae88c774e12b185c3dcfde54e01cb9dda0a89 Mon Sep 17 00:00:00 2001 From: lan Date: Tue, 18 Jan 2022 17:31:12 +0800 Subject: [PATCH 1/2] HTTPS:'WrappedSocket' object has no attribute 'getsockname' and 'getpeername' --- httprunner/client.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/httprunner/client.py b/httprunner/client.py index 71f228f9..841ba1f2 100644 --- a/httprunner/client.py +++ b/httprunner/client.py @@ -181,19 +181,19 @@ class HttpSession(requests.Session): try: client_ip, client_port = response.raw.connection.sock.getsockname() - self.data.address.client_ip = client_ip - self.data.address.client_port = client_port - logger.debug(f"client IP: {client_ip}, Port: {client_port}") - except AttributeError as ex: - logger.warning(f"failed to get client address info: {ex}") + except AttributeError: + client_ip, client_port = response.raw.connection.sock.socket.getsockname() + self.data.address.client_ip = client_ip + self.data.address.client_port = client_port + logger.debug(f"client IP: {client_ip}, Port: {client_port}") try: server_ip, server_port = response.raw.connection.sock.getpeername() - self.data.address.server_ip = server_ip - self.data.address.server_port = server_port - logger.debug(f"server IP: {server_ip}, Port: {server_port}") - except AttributeError as ex: - logger.warning(f"failed to get server address info: {ex}") + except AttributeError: + server_ip, server_port = response.raw.connection.sock.socket.getpeername() + self.data.address.server_ip = server_ip + self.data.address.server_port = server_port + logger.debug(f"server IP: {server_ip}, Port: {server_port}") # get length of the response content content_size = int(dict(response.headers).get("content-length") or 0) From 651a8e4ae00a9a69c11c67882e8a464777255b4c Mon Sep 17 00:00:00 2001 From: lan Date: Tue, 18 Jan 2022 17:33:51 +0800 Subject: [PATCH 2/2] .env file ignore blank lines and comments --- httprunner/loader.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/httprunner/loader.py b/httprunner/loader.py index 74cacad6..5b4bc6e4 100644 --- a/httprunner/loader.py +++ b/httprunner/loader.py @@ -130,6 +130,9 @@ def load_dot_env_file(dot_env_path: Text) -> Dict: with open(dot_env_path, mode="rb") as fp: for line in fp: # maxsplit=1 + line = line.strip() + if not len(line) or line.startswith(b"#"): + continue if b"=" in line: variable, value = line.split(b"=", 1) elif b":" in line: