Create cache directory for storing images for SP Portal

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

diff --git a/tests/helpers/common.py b/tests/helpers/common.py
index 93d0f17..87cbd44 100755 (executable)
--- a/tests/helpers/common.py
+++ b/tests/helpers/common.py
@@ -96,15 +96,16 @@ class IpsilonTestBase(object):
         os.mkdir(os.path.join(self.testdir, 'lib'))
         os.mkdir(os.path.join(self.testdir, 'lib', test.name))
         os.mkdir(os.path.join(self.testdir, 'log'))
+        os.mkdir(os.path.join(self.testdir, 'cache'))
 
     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():
+        for k in global_opts:
             newconf.set('globals', k, global_opts[k])
         newconf.add_section('arguments')
-        for k in args_opts.keys():
+        for k in args_opts:
             newconf.set('arguments', k, args_opts[k])
 
         profile = io.BytesIO()
@@ -177,6 +178,7 @@ class IpsilonTestBase(object):
         p = subprocess.Popen(['/usr/sbin/httpd', '-DFOREGROUND', '-f', conf],
                              env=env, preexec_fn=os.setsid)
         self.processes.append(p)
+        return p
 
     def start_pgdb_server(self, datadir, rundir, log, addr, port, env):
         p = subprocess.Popen(['/usr/bin/pg_ctl', 'start', '-D', datadir, '-o',
@@ -187,7 +189,7 @@ class IpsilonTestBase(object):
         self.processes.append(p)
         p.wait()
         for d in ['adminconfig', 'users', 'transactions', 'sessions',
-                  'saml2sessions']:
+                  'saml2.sessions.db']:
             cmd = ['/usr/bin/createdb', '-h', addr, '-p', port, d]
             subprocess.check_call(cmd, env=env)