diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 19:56:57 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 19:56:57 +0200 |
| commit | 292a0aa9e671748f0ad77a5e8f8f21d40314b030 (patch) | |
| tree | 347430a4d918b3371926a0cfe825efaeca2379cf /test/tservers.py | |
| parent | 0ad5cbc6bf5e9c4d0b5af85544b77dcb29cddb56 (diff) | |
| download | mitmproxy-292a0aa9e671748f0ad77a5e8f8f21d40314b030.tar.gz mitmproxy-292a0aa9e671748f0ad77a5e8f8f21d40314b030.tar.bz2 mitmproxy-292a0aa9e671748f0ad77a5e8f8f21d40314b030.zip | |
make tests compatible with py.test
Diffstat (limited to 'test/tservers.py')
| -rw-r--r-- | test/tservers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tservers.py b/test/tservers.py index 1f4ce725..c47d6a5f 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -26,7 +26,7 @@ class ServerTestBase(object): addr = ("localhost", 0) @classmethod - def setupAll(cls): + def setup_class(cls): cls.q = queue.Queue() s = cls.makeserver() cls.port = s.address.port @@ -38,7 +38,7 @@ class ServerTestBase(object): return TServer(cls.ssl, cls.q, cls.handler, cls.addr) @classmethod - def teardownAll(cls): + def teardown_class(cls): cls.server.shutdown() @property |