Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1766 from Kriechi/fix-test-race 

tests: fix race condition
This commit is contained in:
Thomas Kriechbaumer 2016-11-20 17:02:49 +01:00 committed by GitHub
parent 078f36d86a f45034e8f1
commit 79c753d8f8
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/mitmproxy/protocol/test_http2.py
View File

@ -649,6 +649,9 @@ class TestPushPromise(_Http2Test):
return True
h2_conn.send_headers(1, [(':status', '200')])
wfile.write(h2_conn.data_to_send())
wfile.flush()
h2_conn.push_stream(1, 2, [
(':authority', "127.0.0.1:{}".format(cls.port)),
(':method', 'GET'),
@ -656,6 +659,9 @@ class TestPushPromise(_Http2Test):
(':path', '/pushed_stream_foo'),
('foo', 'bar')
])
wfile.write(h2_conn.data_to_send())
wfile.flush()
h2_conn.push_stream(1, 4, [
(':authority', "127.0.0.1:{}".format(cls.port)),
(':method', 'GET'),
@ -672,12 +678,19 @@ class TestPushPromise(_Http2Test):
wfile.flush()
h2_conn.send_data(1, b'regular_stream')
h2_conn.send_data(2, b'pushed_stream_foo')
h2_conn.send_data(4, b'pushed_stream_bar')
wfile.write(h2_conn.data_to_send())
wfile.flush()
h2_conn.end_stream(1)
wfile.write(h2_conn.data_to_send())
wfile.flush()
h2_conn.send_data(2, b'pushed_stream_foo')
h2_conn.end_stream(2)
wfile.write(h2_conn.data_to_send())
wfile.flush()
h2_conn.send_data(4, b'pushed_stream_bar')
h2_conn.end_stream(4)
wfile.write(h2_conn.data_to_send())
wfile.flush()
@ -791,9 +804,6 @@ class TestPushPromise(_Http2Test):
assert b'regular_stream' in bodies
# the other two bodies might not be transmitted before the reset
pushed_flows = [flow for flow in self.master.state.flows if 'h2-pushed-stream' in flow.metadata]
assert len(pushed_flows) == 2
@requires_alpn
class TestConnectionLost(_Http2Test):