aboutsummaryrefslogtreecommitdiffstats
path: root/test/tservers.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-03-02 22:42:36 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-03-02 22:42:36 +1300
commitc20d1d7d32ea2ab1d1c4dd9a34724a8732c23338 (patch)
tree964c326ecb84ba8174abee4348ee1f63b1b0f931 /test/tservers.py
parent415844511c19b17743b42a5833590d1d683427d2 (diff)
downloadmitmproxy-c20d1d7d32ea2ab1d1c4dd9a34724a8732c23338.tar.gz
mitmproxy-c20d1d7d32ea2ab1d1c4dd9a34724a8732c23338.tar.bz2
mitmproxy-c20d1d7d32ea2ab1d1c4dd9a34724a8732c23338.zip
Extend unit tests for proxy.py to some tricky cases.
Diffstat (limited to 'test/tservers.py')
-rw-r--r--test/tservers.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/tservers.py b/test/tservers.py
index 4efed7e2..7672f34a 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -131,7 +131,7 @@ class ProxTestBase:
class HTTPProxTest(ProxTestBase):
def pathoc_raw(self):
return libpathod.pathoc.Pathoc("127.0.0.1", self.proxy.port)
-
+
def pathoc(self, sni=None):
"""
Returns a connected Pathoc instance.
@@ -148,6 +148,7 @@ class HTTPProxTest(ProxTestBase):
Constructs a pathod GET request, with the appropriate base and proxy.
"""
p = self.pathoc(sni=sni)
+ spec = spec.encode("string_escape")
if self.ssl:
q = "get:'/p/%s'"%spec
else:
@@ -165,6 +166,7 @@ class TResolver:
class TransparentProxTest(ProxTestBase):
ssl = None
+ resolver = TResolver
@classmethod
def get_proxy_config(cls):
d = ProxTestBase.get_proxy_config()
@@ -173,7 +175,7 @@ class TransparentProxTest(ProxTestBase):
else:
ports = []
d["transparent_proxy"] = dict(
- resolver = TResolver(cls.server.port),
+ resolver = cls.resolver(cls.server.port),
sslports = ports
)
return d