diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-22 12:25:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-22 12:25:18 -0700 |
| commit | b3502b92c8abf60cbd6de14428ca0b5934a83c27 (patch) | |
| tree | 4a0b547ca112c5a8cb6ef28d23d4eb6e8c9dcfe9 /test | |
| parent | 66a2b0d61563efc529931e9a2b2d82a9d00159a5 (diff) | |
| parent | d655d8f1f3b362201a9883d0dd03df31fddf481d (diff) | |
| download | mitmproxy-b3502b92c8abf60cbd6de14428ca0b5934a83c27.tar.gz mitmproxy-b3502b92c8abf60cbd6de14428ca0b5934a83c27.tar.bz2 mitmproxy-b3502b92c8abf60cbd6de14428ca0b5934a83c27.zip | |
Merge pull request #1282 from dufferzafar/py3
Python 3 - mitmproxy.{protocol.http1, proxy, platform.pf}
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_protocol_http1.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/test_protocol_http1.py b/test/mitmproxy/test_protocol_http1.py index e0a57b4e..cf7bd598 100644 --- a/test/mitmproxy/test_protocol_http1.py +++ b/test/mitmproxy/test_protocol_http1.py @@ -18,14 +18,14 @@ class TestInvalidRequests(tservers.HTTPProxyTest): p = self.pathoc() r = p.request("connect:'%s:%s'" % ("127.0.0.1", self.server2.port)) assert r.status_code == 400 - assert "Invalid HTTP request form" in r.content + assert b"Invalid HTTP request form" in r.content def test_relative_request(self): p = self.pathoc_raw() p.connect() r = p.request("get:/p/200") assert r.status_code == 400 - assert "Invalid HTTP request form" in r.content + assert b"Invalid HTTP request form" in r.content class TestExpectHeader(tservers.HTTPProxyTest): @@ -43,8 +43,8 @@ class TestExpectHeader(tservers.HTTPProxyTest): ) client.wfile.flush() - assert client.rfile.readline() == "HTTP/1.1 100 Continue\r\n" - assert client.rfile.readline() == "\r\n" + assert client.rfile.readline() == b"HTTP/1.1 100 Continue\r\n" + assert client.rfile.readline() == b"\r\n" client.wfile.write(b"0123456789abcdef\r\n") client.wfile.flush() |