diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 15:16:12 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 15:16:12 +0200 |
| commit | 8d71059d77c2dd1d9858d7971dd0b6b4387ed9f4 (patch) | |
| tree | 831f47cfd19e7d58c0f31b0a924832d421d4eb52 /test | |
| parent | a07e43df8b3988f137b48957f978ad570d9dc782 (diff) | |
| download | mitmproxy-8d71059d77c2dd1d9858d7971dd0b6b4387ed9f4.tar.gz mitmproxy-8d71059d77c2dd1d9858d7971dd0b6b4387ed9f4.tar.bz2 mitmproxy-8d71059d77c2dd1d9858d7971dd0b6b4387ed9f4.zip | |
clean up http message models
Diffstat (limited to 'test')
| -rw-r--r-- | test/http/http2/test_protocol.py | 4 | ||||
| -rw-r--r-- | test/test_utils.py | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/http/http2/test_protocol.py b/test/http/http2/test_protocol.py index 598b5cd7..a55941e0 100644 --- a/test/http/http2/test_protocol.py +++ b/test/http/http2/test_protocol.py @@ -413,7 +413,7 @@ class TestReadResponse(tservers.ServerTestBase): resp = protocol.read_response(NotImplemented, stream_id=42) - assert resp.httpversion == (2, 0) + assert resp.http_version == (2, 0) assert resp.status_code == 200 assert resp.msg == "" assert resp.headers.fields == [[':status', '200'], ['etag', 'foobar']] @@ -440,7 +440,7 @@ class TestReadEmptyResponse(tservers.ServerTestBase): resp = protocol.read_response(NotImplemented, stream_id=42) assert resp.stream_id == 42 - assert resp.httpversion == (2, 0) + assert resp.http_version == (2, 0) assert resp.status_code == 200 assert resp.msg == "" assert resp.headers.fields == [[':status', '200'], ['etag', 'foobar']] diff --git a/test/test_utils.py b/test/test_utils.py index eb7aa31a..0db75578 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -103,11 +103,11 @@ def test_get_header_tokens(): headers = Headers() assert utils.get_header_tokens(headers, "foo") == [] headers["foo"] = "bar" - assert utils.get_header_tokens(headers, "foo") == ["bar"] + assert utils.get_header_tokens(headers, "foo") == [b"bar"] headers["foo"] = "bar, voing" - assert utils.get_header_tokens(headers, "foo") == ["bar", "voing"] + assert utils.get_header_tokens(headers, "foo") == [b"bar", b"voing"] headers.set_all("foo", ["bar, voing", "oink"]) - assert utils.get_header_tokens(headers, "foo") == ["bar", "voing", "oink"] + assert utils.get_header_tokens(headers, "foo") == [b"bar", b"voing", b"oink"] def test_multipartdecode(): @@ -134,8 +134,8 @@ def test_multipartdecode(): def test_parse_content_type(): p = utils.parse_content_type - assert p("text/html") == ("text", "html", {}) - assert p("text") is None + assert p(b"text/html") == (b"text", b"html", {}) + assert p(b"text") is None - v = p("text/html; charset=UTF-8") - assert v == ('text', 'html', {'charset': 'UTF-8'}) + v = p(b"text/html; charset=UTF-8") + assert v == (b'text', b'html', {b'charset': b'UTF-8'}) |