From 221973aff6553ffb1d40859c5d35b88d959f9718 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 7 Mar 2014 16:38:24 +1300
Subject: Revert to old cert names, use a subdir for test conf dir.

---
 test/test_app.py | 1 -
 test/tservers.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

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,
-- 
cgit v1.2.3