diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 16:17:05 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 16:17:05 +1300 |
| commit | 9c88622e25033cab300d2bbde2811c346c3caa8c (patch) | |
| tree | 70ad615eba3084de7955a50acda6ec45d3ae4638 /test/tservers.py | |
| parent | 0906ee94acc2c25d4cb836461263d7a2d35b8b4a (diff) | |
| download | mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.tar.gz mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.tar.bz2 mitmproxy-9c88622e25033cab300d2bbde2811c346c3caa8c.zip | |
Adjust tests
Diffstat (limited to 'test/tservers.py')
| -rw-r--r-- | test/tservers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/tservers.py b/test/tservers.py index 93c8a80a..12154ba7 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -99,7 +99,7 @@ class ProxTestBase(object): @classmethod def teardownAll(cls): - shutil.rmtree(cls.confdir) + shutil.rmtree(cls.cadir) cls.proxy.shutdown() cls.server.shutdown() cls.server2.shutdown() @@ -116,10 +116,10 @@ class ProxTestBase(object): @classmethod def get_proxy_config(cls): - cls.confdir = os.path.join(tempfile.gettempdir(), "mitmproxy") + cls.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy") return dict( no_upstream_cert = cls.no_upstream_cert, - confdir = cls.confdir, + cadir = cls.cadir, authenticator = cls.authenticator, certforward = cls.certforward, ssl_ports=([cls.server.port, cls.server2.port] if cls.ssl else []), |