aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_fuzzing.py4
-rw-r--r--test/test_server.py6
-rw-r--r--test/tservers.py20
3 files changed, 19 insertions, 11 deletions
diff --git a/test/test_fuzzing.py b/test/test_fuzzing.py
index 646ce5c1..3e5fc100 100644
--- a/test/test_fuzzing.py
+++ b/test/test_fuzzing.py
@@ -27,7 +27,7 @@ class TestFuzzy(tservers.HTTPProxTest):
assert p.request(req%self.server.port).status_code == 400
def test_invalid_upstream(self):
- req = r"get:'http://localhost:%s/p/200:i10,\'+\''"
+ req = r"get:'http://localhost:%s/p/200:i10,\x27+\x27'"
p = self.pathoc()
assert p.request(req%self.server.port).status_code == 502
@@ -35,5 +35,3 @@ class TestFuzzy(tservers.HTTPProxTest):
req = r'200:d0'
p = self.pathod(req)
assert p.status_code == 502
-
-
diff --git a/test/test_server.py b/test/test_server.py
index 0f0afd7f..7f93c729 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -353,7 +353,9 @@ class TestHttps2Http(tservers.ReverseProxTest):
"""
Returns a connected Pathoc instance.
"""
- p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=ssl, sni=sni)
+ p = libpathod.pathoc.Pathoc(
+ ("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None
+ )
p.connect()
return p
@@ -380,7 +382,7 @@ class TestTransparentSSL(tservers.TransparentProxTest, CommonMixin, TcpMixin):
ssl = True
def test_sslerr(self):
- p = pathoc.Pathoc(("localhost", self.proxy.port))
+ p = pathoc.Pathoc(("localhost", self.proxy.port), fp=None)
p.connect()
r = p.request("get:/")
assert r.status_code == 400
diff --git a/test/tservers.py b/test/tservers.py
index 30c8b52e..bcda0295 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -129,13 +129,15 @@ class ProxTestBase(object):
class HTTPProxTest(ProxTestBase):
def pathoc_raw(self):
- return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port))
+ return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None)
def pathoc(self, sni=None):
"""
Returns a connected Pathoc instance.
"""
- p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni)
+ p = libpathod.pathoc.Pathoc(
+ ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
+ )
if self.ssl:
p.connect(("127.0.0.1", self.server.port))
else:
@@ -156,7 +158,9 @@ class HTTPProxTest(ProxTestBase):
def app(self, page):
if self.ssl:
- p = libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), True)
+ p = libpathod.pathoc.Pathoc(
+ ("127.0.0.1", self.proxy.port), True, fp=None
+ )
p.connect((APP_HOST, APP_PORT))
return p.request("get:'%s'"%page)
else:
@@ -208,7 +212,9 @@ class TransparentProxTest(ProxTestBase):
"""
Returns a connected Pathoc instance.
"""
- p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni)
+ p = libpathod.pathoc.Pathoc(
+ ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
+ )
p.connect()
return p
@@ -231,7 +237,9 @@ class ReverseProxTest(ProxTestBase):
"""
Returns a connected Pathoc instance.
"""
- p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni)
+ p = libpathod.pathoc.Pathoc(
+ ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
+ )
p.connect()
return p
@@ -296,4 +304,4 @@ class ChainProxTest(ProxTestBase):
return d
class HTTPUpstreamProxTest(ChainProxTest, HTTPProxTest):
- pass \ No newline at end of file
+ pass