diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-05 18:15:47 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-05 18:15:47 +0200 |
| commit | 66ee1f465f6c492d5a4ff5659e6f0346fb243d67 (patch) | |
| tree | 81599af6bf38402059dcf6f387dfcf9b599c375e /test/websockets/test_websockets.py | |
| parent | 3718e59308745e4582f4e8061b4ff6113d9dfc74 (diff) | |
| download | mitmproxy-66ee1f465f6c492d5a4ff5659e6f0346fb243d67.tar.gz mitmproxy-66ee1f465f6c492d5a4ff5659e6f0346fb243d67.tar.bz2 mitmproxy-66ee1f465f6c492d5a4ff5659e6f0346fb243d67.zip | |
headers: adjust everything
Diffstat (limited to 'test/websockets/test_websockets.py')
| -rw-r--r-- | test/websockets/test_websockets.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/websockets/test_websockets.py b/test/websockets/test_websockets.py index be87b20a..57cfd166 100644 --- a/test/websockets/test_websockets.py +++ b/test/websockets/test_websockets.py @@ -42,7 +42,7 @@ class WebSocketsEchoHandler(tcp.BaseHandler): preamble = 'HTTP/1.1 101 %s' % status_codes.RESPONSES.get(101) self.wfile.write(preamble + "\r\n") headers = self.protocol.server_handshake_headers(key) - self.wfile.write(headers.format() + "\r\n") + self.wfile.write(str(headers) + "\r\n") self.wfile.flush() self.handshake_done = True @@ -66,8 +66,8 @@ class WebSocketsClient(tcp.TCPClient): preamble = 'GET / HTTP/1.1' self.wfile.write(preamble + "\r\n") headers = self.protocol.client_handshake_headers() - self.client_nonce = headers.get_first("sec-websocket-key") - self.wfile.write(headers.format() + "\r\n") + self.client_nonce = headers["sec-websocket-key"] + self.wfile.write(str(headers) + "\r\n") self.wfile.flush() resp = http1_protocol.read_response("GET", None) @@ -145,13 +145,13 @@ class TestWebSockets(tservers.ServerTestBase): def test_check_server_handshake(self): headers = self.protocol.server_handshake_headers("key") assert self.protocol.check_server_handshake(headers) - headers["Upgrade"] = ["not_websocket"] + headers["Upgrade"] = "not_websocket" assert not self.protocol.check_server_handshake(headers) def test_check_client_handshake(self): headers = self.protocol.client_handshake_headers("key") assert self.protocol.check_client_handshake(headers) == "key" - headers["Upgrade"] = ["not_websocket"] + headers["Upgrade"] = "not_websocket" assert not self.protocol.check_client_handshake(headers) @@ -166,7 +166,7 @@ class BadHandshakeHandler(WebSocketsEchoHandler): preamble = 'HTTP/1.1 101 %s' % status_codes.RESPONSES.get(101) self.wfile.write(preamble + "\r\n") headers = self.protocol.server_handshake_headers("malformed key") - self.wfile.write(headers.format() + "\r\n") + self.wfile.write(str(headers) + "\r\n") self.wfile.flush() self.handshake_done = True |