diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-05 09:37:43 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-05 10:57:20 +1200 |
| commit | 20cc1b6aa4488d9b230469ba57b6a92380bfeeca (patch) | |
| tree | a20860bfc43c9d0e977982d9d6dabe5eb7b29846 /test/test_tcp.py | |
| parent | 96af5c16a065a8167d167ed1d4dc9e0a77566e25 (diff) | |
| download | mitmproxy-20cc1b6aa4488d9b230469ba57b6a92380bfeeca.tar.gz mitmproxy-20cc1b6aa4488d9b230469ba57b6a92380bfeeca.tar.bz2 mitmproxy-20cc1b6aa4488d9b230469ba57b6a92380bfeeca.zip | |
Refactor TCP test suite.
Diffstat (limited to 'test/test_tcp.py')
| -rw-r--r-- | test/test_tcp.py | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py index b9f274ae..359890d5 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -17,7 +17,10 @@ class ServerThread(threading.Thread): class ServerTestBase: @classmethod def setupAll(cls): - cls.server = ServerThread(cls.makeserver()) + cls.q = Queue.Queue() + s = cls.makeserver() + cls.port = s.port + cls.server = ServerThread(s) cls.server.start() @classmethod @@ -88,10 +91,7 @@ class TServer(tcp.TCPServer): class TestServer(ServerTestBase): @classmethod def makeserver(cls): - cls.q = Queue.Queue() - s = TServer(("127.0.0.1", 0), False, cls.q, EchoHandler) - cls.port = s.port - return s + return TServer(("127.0.0.1", 0), False, cls.q, EchoHandler) def test_echo(self): testval = "echo!\n" @@ -105,10 +105,7 @@ class TestServer(ServerTestBase): class TestServerSSL(ServerTestBase): @classmethod def makeserver(cls): - cls.q = Queue.Queue() - s = TServer(("127.0.0.1", 0), True, cls.q, EchoHandler) - cls.port = s.port - return s + return TServer(("127.0.0.1", 0), True, cls.q, EchoHandler) def test_echo(self): c = tcp.TCPClient("127.0.0.1", self.port) @@ -126,10 +123,7 @@ class TestServerSSL(ServerTestBase): class TestSSLv3Only(ServerTestBase): @classmethod def makeserver(cls): - cls.q = Queue.Queue() - s = TServer(("127.0.0.1", 0), True, cls.q, EchoHandler, True) - cls.port = s.port - return s + return TServer(("127.0.0.1", 0), True, cls.q, EchoHandler, True) def test_failure(self): c = tcp.TCPClient("127.0.0.1", self.port) @@ -140,10 +134,7 @@ class TestSSLv3Only(ServerTestBase): class TestSNI(ServerTestBase): @classmethod def makeserver(cls): - cls.q = Queue.Queue() - s = TServer(("127.0.0.1", 0), True, cls.q, SNIHandler) - cls.port = s.port - return s + return TServer(("127.0.0.1", 0), True, cls.q, SNIHandler) def test_echo(self): c = tcp.TCPClient("127.0.0.1", self.port) @@ -155,10 +146,7 @@ class TestSNI(ServerTestBase): class TestSSLDisconnect(ServerTestBase): @classmethod def makeserver(cls): - cls.q = Queue.Queue() - s = TServer(("127.0.0.1", 0), True, cls.q, DisconnectHandler) - cls.port = s.port - return s + return TServer(("127.0.0.1", 0), True, cls.q, DisconnectHandler) def test_echo(self): c = tcp.TCPClient("127.0.0.1", self.port) |