diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-03-07 16:38:24 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-03-07 16:38:24 +1300 |
| commit | 221973aff6553ffb1d40859c5d35b88d959f9718 (patch) | |
| tree | 7bc325fae6224ac36953e380b3d24a974ea5b869 /test | |
| parent | 9b17d272a351c2f63748a565dcdb9823f9cea34b (diff) | |
| download | mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.tar.gz mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.tar.bz2 mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.zip | |
Revert to old cert names, use a subdir for test conf dir.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_app.py | 1 | ||||
| -rw-r--r-- | test/tservers.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/test_app.py b/test/test_app.py index 52cd1ba6..0b6ed14c 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -14,4 +14,3 @@ class TestApp(tservers.HTTPProxTest): resp = self.app("/cert/%s" % ext) assert resp.status_code == 200 assert resp.content - diff --git a/test/tservers.py b/test/tservers.py index 3a6a610f..cf9b3f73 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -1,3 +1,4 @@ +import os.path import threading, Queue import shutil, tempfile import flask @@ -82,7 +83,7 @@ class ProxTestBase(object): cls.server = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions) cls.server2 = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions) pconf = cls.get_proxy_config() - cls.confdir = tempfile.gettempdir() + cls.confdir = os.path.join(tempfile.gettempdir(), "mitmproxy") config = proxy.ProxyConfig( no_upstream_cert = cls.no_upstream_cert, confdir = cls.confdir, |