Add options to explicitly set database uris during install

[cascardo/ipsilon.git] / tests / helpers / common.py

diff --git a/tests/helpers/common.py b/tests/helpers/common.py
index 07a41fe..4cf27f9 100755 (executable)
--- a/tests/helpers/common.py
+++ b/tests/helpers/common.py
@@ -55,7 +55,8 @@ class IpsilonTestBase(object):
         os.mkdir(os.path.join(self.testdir, 'lib', test.name))
         os.mkdir(os.path.join(self.testdir, 'log'))
 
-    def generate_profile(self, global_opts, args_opts, name, addr, port):
+    def generate_profile(self, global_opts, args_opts, name, addr, port,
+                         nameid='unspecified'):
         newconf = ConfigParser.ConfigParser()
         newconf.add_section('globals')
         for k in global_opts.keys():
@@ -71,6 +72,7 @@ class IpsilonTestBase(object):
         text = t.substitute({'NAME': name, 'ADDRESS': addr, 'PORT': port,
                              'TESTDIR': self.testdir,
                              'ROOTDIR': self.rootdir,
+                             'NAMEID': nameid,
                              'TEST_USER': self.testuser})
 
         filename = os.path.join(self.testdir, '%s_profile.cfg' % name)
@@ -141,7 +143,7 @@ class IpsilonTestBase(object):
                              env=env, preexec_fn=os.setsid)
         self.processes.append(p)
         p.wait()
-        for d in ['adminconfig', 'userprefs', 'transactions', 'sessions']:
+        for d in ['adminconfig', 'users', 'transactions', 'sessions']:
             cmd = ['/usr/bin/createdb', '-h', addr, '-p', port, d]
             subprocess.check_call(cmd, env=env)