diff options
author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-01-25 21:12:11 +0100 |
---|---|---|
committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-02 10:15:01 +0100 |
commit | 380d8ec37041d0128df0e0a9ede4b157314f6546 (patch) | |
tree | 05a4a6e5d6beb00c7c278d9e06b2e27af05c2837 /mitmproxy | |
parent | 3ae060f0d334eebb59c97d0647a2f39ee1b60549 (diff) | |
download | mitmproxy-380d8ec37041d0128df0e0a9ede4b157314f6546.tar.gz mitmproxy-380d8ec37041d0128df0e0a9ede4b157314f6546.tar.bz2 mitmproxy-380d8ec37041d0128df0e0a9ede4b157314f6546.zip |
increase test coverage
Diffstat (limited to 'mitmproxy')
-rw-r--r-- | mitmproxy/net/http/http2/framereader.py | 4 | ||||
-rw-r--r-- | mitmproxy/net/http/http2/utils.py | 7 | ||||
-rw-r--r-- | mitmproxy/utils/debug.py | 10 | ||||
-rw-r--r-- | mitmproxy/utils/typecheck.py | 1 |
4 files changed, 12 insertions, 10 deletions
diff --git a/mitmproxy/net/http/http2/framereader.py b/mitmproxy/net/http/http2/framereader.py index 6a164919..777d247d 100644 --- a/mitmproxy/net/http/http2/framereader.py +++ b/mitmproxy/net/http/http2/framereader.py @@ -1,6 +1,6 @@ import codecs -import hyperframe +import hyperframe.frame from mitmproxy import exceptions @@ -20,6 +20,6 @@ def parse_frame(header, body=None): body = header[9:] header = header[:9] - frame, length = hyperframe.frame.Frame.parse_frame_header(header) + frame, _ = hyperframe.frame.Frame.parse_frame_header(header) frame.parse_body(memoryview(body)) return frame diff --git a/mitmproxy/net/http/http2/utils.py b/mitmproxy/net/http/http2/utils.py index 62a59c72..24dc773c 100644 --- a/mitmproxy/net/http/http2/utils.py +++ b/mitmproxy/net/http/http2/utils.py @@ -14,11 +14,12 @@ def parse_headers(headers): host = None port = None + if method == b'CONNECT': + raise NotImplementedError("CONNECT over HTTP/2 is not implemented.") + if path == b'*' or path.startswith(b"/"): first_line_format = "relative" - elif method == b'CONNECT': # pragma: no cover - raise NotImplementedError("CONNECT over HTTP/2 is not implemented.") - else: # pragma: no cover + else: first_line_format = "absolute" # FIXME: verify if path or :host contains what we need scheme, host, port, _ = url.parse(path) diff --git a/mitmproxy/utils/debug.py b/mitmproxy/utils/debug.py index 52f48f6b..ff98b86c 100644 --- a/mitmproxy/utils/debug.py +++ b/mitmproxy/utils/debug.py @@ -45,17 +45,17 @@ def dump_system_info(): ] d = platform.linux_distribution() t = "Linux distro: %s %s %s" % d - if d[0]: # pragma: no-cover + if d[0]: # pragma: no cover data.append(t) d = platform.mac_ver() t = "Mac version: %s %s %s" % d - if d[0]: # pragma: no-cover + if d[0]: # pragma: no cover data.append(t) d = platform.win32_ver() t = "Windows version: %s %s %s %s" % d - if d[0]: # pragma: no-cover + if d[0]: # pragma: no cover data.append(t) return "\n".join(data) @@ -135,11 +135,11 @@ def dump_stacks(signal=None, frame=None, file=sys.stdout, testing=False): if line: code.append(" %s" % (line.strip())) print("\n".join(code), file=file) - if not testing: + if not testing: # pragma: no cover sys.exit(1) def register_info_dumpers(): - if os.name != "nt": + if os.name != "nt": # pragma: windows no cover signal.signal(signal.SIGUSR1, dump_info) signal.signal(signal.SIGUSR2, dump_stacks) diff --git a/mitmproxy/utils/typecheck.py b/mitmproxy/utils/typecheck.py index ae1a507d..2cdf7f51 100644 --- a/mitmproxy/utils/typecheck.py +++ b/mitmproxy/utils/typecheck.py @@ -58,6 +58,7 @@ def check_type(attr_name: str, value: typing.Any, typeinfo: type) -> None: except AttributeError: # Python 3.5.0 T = typeinfo.__parameters__[0] + if not isinstance(value, (tuple, list)): raise e for v in value: |