diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-05 21:32:53 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-10 20:34:27 +0200 |
| commit | 690b8b4f4e00d60b373b5a1481930f21bbc5054a (patch) | |
| tree | dd0091035e4027e792174cb2dcf63eb37afa0a56 /test/websockets | |
| parent | c2832ef72bd4eed485a1c8d4bcb732da69896444 (diff) | |
| download | mitmproxy-690b8b4f4e00d60b373b5a1481930f21bbc5054a.tar.gz mitmproxy-690b8b4f4e00d60b373b5a1481930f21bbc5054a.tar.bz2 mitmproxy-690b8b4f4e00d60b373b5a1481930f21bbc5054a.zip | |
add move tests and code from mitmproxy
Diffstat (limited to 'test/websockets')
| -rw-r--r-- | test/websockets/test_websockets.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/websockets/test_websockets.py b/test/websockets/test_websockets.py index 28dbb833..9fa98172 100644 --- a/test/websockets/test_websockets.py +++ b/test/websockets/test_websockets.py @@ -3,6 +3,7 @@ import os from nose.tools import raises from netlib import tcp, http, websockets, tutils +from netlib.http import status_codes from netlib.http.exceptions import * from netlib.http.http1 import HTTP1Protocol from .. import tservers @@ -38,7 +39,7 @@ class WebSocketsEchoHandler(tcp.BaseHandler): req = http1_protocol.read_request() key = self.protocol.check_client_handshake(req.headers) - preamble = http1_protocol.response_preamble(101) + 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") @@ -62,7 +63,7 @@ class WebSocketsClient(tcp.TCPClient): http1_protocol = HTTP1Protocol(self) - preamble = http1_protocol.request_preamble("GET", "/") + 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") @@ -162,7 +163,7 @@ class BadHandshakeHandler(WebSocketsEchoHandler): client_hs = http1_protocol.read_request() self.protocol.check_client_handshake(client_hs.headers) - preamble = http1_protocol.response_preamble(101) + 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") |