diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-13 15:04:38 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-13 15:04:38 +0100 |
| commit | f2e8efdf15a5f6bc3636eaf00b280c8ad6fda37b (patch) | |
| tree | cd6740934b5692693d5d9153cdb538b3d6a289fb /netlib/test.py | |
| parent | 969595cca70edc4d02d5f676221267edf01e4252 (diff) | |
| parent | 6f26cec83e77f8998b50988c54196f9dfae5b7dd (diff) | |
| download | mitmproxy-f2e8efdf15a5f6bc3636eaf00b280c8ad6fda37b.tar.gz mitmproxy-f2e8efdf15a5f6bc3636eaf00b280c8ad6fda37b.tar.bz2 mitmproxy-f2e8efdf15a5f6bc3636eaf00b280c8ad6fda37b.zip | |
merge smurfix/ipv6, add ipv6 support for TCPServer, add ipv6 test
Diffstat (limited to 'netlib/test.py')
| -rw-r--r-- | netlib/test.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netlib/test.py b/netlib/test.py index e7d4c233..cd1a3847 100644 --- a/netlib/test.py +++ b/netlib/test.py @@ -16,6 +16,9 @@ class ServerThread(threading.Thread): class ServerTestBase: ssl = None handler = None + addr = ("localhost", 0) + use_ipv6 = False + @classmethod def setupAll(cls): cls.q = Queue.Queue() @@ -26,7 +29,7 @@ class ServerTestBase: @classmethod def makeserver(cls): - return TServer(cls.ssl, cls.q, cls.handler) + return TServer(cls.ssl, cls.q, cls.handler, cls.addr, cls.use_ipv6) @classmethod def teardownAll(cls): @@ -38,11 +41,11 @@ class ServerTestBase: class TServer(tcp.TCPServer): - def __init__(self, ssl, q, handler_klass, addr=("127.0.0.1", 0)): + def __init__(self, ssl, q, handler_klass, addr, use_ipv6): """ ssl: A {cert, key, v3_only} dict. """ - tcp.TCPServer.__init__(self, addr) + tcp.TCPServer.__init__(self, addr, use_ipv6=use_ipv6) self.ssl, self.q = ssl, q self.handler_klass = handler_klass self.last_handler = None |