isolate test_keygen data

This makes test_keygen use its own basedir, to avoid polluting the _trial_temp
directory for later tests.

diff --git a/src/allmydata/key_generator.py b/src/allmydata/key_generator.py
index 89c8baffbcc095ff0024404eb70db977358a09da..63bf51b833f31be7ca567cfa8654398164a5286a 100644 (file)
--- a/src/allmydata/key_generator.py
+++ b/src/allmydata/key_generator.py
@@ -6,7 +6,7 @@ from foolscap.api import Referenceable, Tub
 from zope.interface import implements
 from twisted.internet import reactor
 from twisted.application import service
-from allmydata.util import log
+from allmydata.util import log, fileutil
 
 from pycryptopp.publickey import rsa
 from allmydata.interfaces import RIKeyGenerator
@@ -79,6 +79,7 @@ class KeyGeneratorService(service.MultiService):
     def __init__(self, basedir='.', display_furl=True, default_key_size=2048):
         service.MultiService.__init__(self)
         self.basedir = basedir
+        fileutil.make_dirs(self.basedir)
         self.tub = Tub(certFile=os.path.join(self.basedir, 'key_generator.pem'))
         self.tub.setOption("expose-remote-exception-types", False)
         self.tub.setServiceParent(self)

diff --git a/src/allmydata/test/test_keygen.py b/src/allmydata/test/test_keygen.py
index fe459cfbd3e04fdd142d7a92dc4f366f2daf9c41..71d7eafd95f8f691219df7119ea509f8174e7b22 100644 (file)
--- a/src/allmydata/test/test_keygen.py
+++ b/src/allmydata/test/test_keygen.py
@@ -43,7 +43,7 @@ class KeyGenService(unittest.TestCase, pollmixin.PollMixin):
 
         #print 'starting key generator service'
         keysize = TEST_RSA_KEY_SIZE
-        kgs = key_generator.KeyGeneratorService(display_furl=False, default_key_size=keysize)
+        kgs = key_generator.KeyGeneratorService(display_furl=False, default_key_size=keysize, basedir="key_generator_service")
         kgs.key_generator.verbose = True
         kgs.setServiceParent(self.parent)
         kgs.key_generator.pool_size = 8