aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_protocol_http.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-10 17:02:09 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-10 17:02:09 +0100
commitb59013f6e3d80fa6bbf5640f2652559457f07d0e (patch)
treebba552a4d7f089dc422df2aff2a9095153118311 /test/test_protocol_http.py
parent982da23e9a219d055c2137f56b885c06006ca098 (diff)
parent9cc10630c8e0b0f249ed852299d3316ba42f128d (diff)
downloadmitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.gz
mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.bz2
mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.zip
Merge branch 'absolutely_relative_proxying'
Diffstat (limited to 'test/test_protocol_http.py')
-rw-r--r--test/test_protocol_http.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py
index 6ff0cb65..290d82a1 100644
--- a/test/test_protocol_http.py
+++ b/test/test_protocol_http.py
@@ -90,7 +90,7 @@ class TestInvalidRequests(tservers.HTTPProxTest):
def test_double_connect(self):
p = self.pathoc()
r = p.request("connect:'%s:%s'" % ("127.0.0.1", self.server2.port))
- assert r.status_code == 502
+ assert r.status_code == 400
assert "Must not CONNECT on already encrypted connection" in r.content
def test_relative_request(self):
@@ -98,7 +98,7 @@ class TestInvalidRequests(tservers.HTTPProxTest):
p.connect()
r = p.request("get:/p/200")
assert r.status_code == 400
- assert "Invalid request form" in r.content
+ assert "Invalid HTTP request form" in r.content
class TestProxyChaining(tservers.HTTPChainProxyTest):