aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_protocol_http.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-02 01:16:48 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-02 01:16:48 +0200
commitc14fbc7794eee2a60d3c90f818ec481cf9db544b (patch)
tree529949dc40052291460b485142330932cf51819a /test/test_protocol_http.py
parente8de7595c2e8a98418593e90b886e45a745e234a (diff)
parentf1c8b47b1eb153d448061c0ddce21030c31af2b7 (diff)
downloadmitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.tar.gz
mitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.tar.bz2
mitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.zip
Merge pull request #741 from mitmproxy/proxy-refactor-cb
Proxy Refactor
Diffstat (limited to 'test/test_protocol_http.py')
-rw-r--r--test/test_protocol_http.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py
index 2da54093..cd0f77fa 100644
--- a/test/test_protocol_http.py
+++ b/test/test_protocol_http.py
@@ -4,6 +4,7 @@ from cStringIO import StringIO
from mock import MagicMock
from libmproxy.protocol.http import *
+import netlib.http
from netlib import odict
from netlib.http import http1
from netlib.http.semantics import CONTENT_MISSING
@@ -56,7 +57,7 @@ class TestInvalidRequests(tservers.HTTPProxTest):
p = self.pathoc()
r = p.request("connect:'%s:%s'" % ("127.0.0.1", self.server2.port))
assert r.status_code == 400
- assert "Must not CONNECT on already encrypted connection" in r.body
+ assert "Invalid HTTP request form" in r.body
def test_relative_request(self):
p = self.pathoc_raw()