aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-17 18:17:35 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-17 18:17:35 +0200
commit7b57c2948eb5bdfc5e1704e30fdd12e721f345ea (patch)
tree8950f230278d5dfed833dd152dce72c34e7297bd /test
parentd9021f85058c8cc517435947e460bc7191f4d2ca (diff)
downloadmitmproxy-7b57c2948eb5bdfc5e1704e30fdd12e721f345ea.tar.gz
mitmproxy-7b57c2948eb5bdfc5e1704e30fdd12e721f345ea.tar.bz2
mitmproxy-7b57c2948eb5bdfc5e1704e30fdd12e721f345ea.zip
cleanup
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_protocol_http2.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index 55a30304..b8f724bd 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
@@ -87,31 +87,31 @@ class _Http2ServerBase(netlib_tservers.ServerTestBase):
class _Http2TestBase(object):
@classmethod
- def setup_class(self):
- self.config = ProxyConfig(**self.get_proxy_config())
+ def setup_class(cls):
+ cls.config = ProxyConfig(**cls.get_proxy_config())
- tmaster = tservers.TestMaster(self.config)
+ tmaster = tservers.TestMaster(cls.config)
tmaster.start_app(APP_HOST, APP_PORT)
- self.proxy = tservers.ProxyThread(tmaster)
- self.proxy.start()
+ cls.proxy = tservers.ProxyThread(tmaster)
+ cls.proxy.start()
@classmethod
def teardown_class(cls):
cls.proxy.shutdown()
- @property
- def master(self):
- return self.proxy.tmaster
-
@classmethod
def get_proxy_config(cls):
cls.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy")
return dict(
- no_upstream_cert = False,
- cadir = cls.cadir,
- authenticator = None,
+ no_upstream_cert=False,
+ cadir=cls.cadir,
+ authenticator=None,
)
+ @property
+ def master(self):
+ return self.proxy.tmaster
+
def setup(self):
self.master.clear_log()
self.master.state.clear()