diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 10:40:19 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 14:37:32 +0200 |
| commit | db02553e2afee044faac898d12bd8d1adadbcd21 (patch) | |
| tree | 1e5910599b7b47c527528f03f896efd2fbf7c907 /test/test_server.py | |
| parent | 8a051511706e2e62c32e0f70e05ecab11d444b6f (diff) | |
| download | mitmproxy-db02553e2afee044faac898d12bd8d1adadbcd21.tar.gz mitmproxy-db02553e2afee044faac898d12bd8d1adadbcd21.tar.bz2 mitmproxy-db02553e2afee044faac898d12bd8d1adadbcd21.zip | |
move code from mitmproxy to netlib
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test_server.py b/test/test_server.py index 27b8aad3..77ba4576 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -2,6 +2,7 @@ import socket import time from OpenSSL import SSL +import netlib.tutils from netlib import tcp, http, socks from netlib.certutils import SSLCert from netlib.http import authentication @@ -9,7 +10,7 @@ from netlib.http.semantics import CONTENT_MISSING from libpathod import pathoc, pathod from libmproxy.proxy.config import HostMatcher -from libmproxy.protocol import KILL, Error +from libmproxy.protocol import KILL, Error, http_wrappers import tutils import tservers @@ -783,7 +784,7 @@ class TestStreamRequest(tservers.HTTPProxTest): class MasterFakeResponse(tservers.TestMaster): def handle_request(self, f): - resp = tutils.tresp() + resp = http_wrappers.HTTPResponse.wrap(netlib.tutils.tresp()) f.reply(resp) @@ -848,7 +849,7 @@ class TestTransparentResolveError(tservers.TransparentProxTest): class MasterIncomplete(tservers.TestMaster): def handle_request(self, f): - resp = tutils.tresp() + resp = http_wrappers.HTTPResponse.wrap(netlib.tutils.tresp()) resp.content = CONTENT_MISSING f.reply(resp) |