aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-25 17:16:31 +0100
committerGitHub <noreply@github.com>2017-03-25 17:16:31 +0100
commit6f00c1bc5d9bd5c862e5f5488800b521352de18b (patch)
treebded69e71f395b53b5e6c01622cbb73ef1471247
parentc6a16e95e856c859b147e72a484feefe96c37ad9 (diff)
parent20776cf2fa613d34478b37848cdd703b48e76f6e (diff)
downloadmitmproxy-6f00c1bc5d9bd5c862e5f5488800b521352de18b.tar.gz
mitmproxy-6f00c1bc5d9bd5c862e5f5488800b521352de18b.tar.bz2
mitmproxy-6f00c1bc5d9bd5c862e5f5488800b521352de18b.zip
Merge pull request #2213 from Kriechi/concurrent-coverage
fix #2201
-rw-r--r--mitmproxy/proxy/protocol/http2.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mitmproxy/proxy/protocol/http2.py b/mitmproxy/proxy/protocol/http2.py
index c1812b3d..2191b54b 100644
--- a/mitmproxy/proxy/protocol/http2.py
+++ b/mitmproxy/proxy/protocol/http2.py
@@ -62,7 +62,7 @@ class SafeH2Connection(connection.H2Connection):
raise_zombie(self.lock.release)
max_outbound_frame_size = self.max_outbound_frame_size
frame_chunk = chunk[position:position + max_outbound_frame_size]
- if self.local_flow_control_window(stream_id) < len(frame_chunk):
+ if self.local_flow_control_window(stream_id) < len(frame_chunk): # pragma: no cover
self.lock.release()
time.sleep(0.1)
continue
@@ -362,7 +362,7 @@ class Http2Layer(base.Layer):
self._kill_all_streams()
-def detect_zombie_stream(func):
+def detect_zombie_stream(func): # pragma: no cover
@functools.wraps(func)
def wrapper(self, *args, **kwargs):
self.raise_zombie()
@@ -454,7 +454,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
else:
return self.request_data_finished
- def raise_zombie(self, pre_command=None):
+ def raise_zombie(self, pre_command=None): # pragma: no cover
connection_closed = self.h2_connection.state_machine.state == h2.connection.ConnectionState.CLOSED
if self.zombie is not None or connection_closed:
if pre_command is not None:
@@ -626,7 +626,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
self.log(repr(e), "info")
except exceptions.SetServerNotAllowedException as e: # pragma: no cover
self.log("Changing the Host server for HTTP/2 connections not allowed: {}".format(e), "info")
- except exceptions.Kill:
+ except exceptions.Kill: # pragma: no cover
self.log("Connection killed", "info")
self.kill()