In configure we do not need to set_config()

[cascardo/ipsilon.git] / quickrun.py

diff --git a/quickrun.py b/quickrun.py
index 8eb64a6..0546fcc 100755 (executable)
--- a/quickrun.py
+++ b/quickrun.py
@@ -19,6 +19,7 @@
 
 import argparse
 import os
+import shutil
 import subprocess
 from string import Template
 
@@ -31,6 +32,8 @@ def parse_args():
         'Run a test Ipsilon instance from the checkout directory')
     parser.add_argument('--workdir', default=os.path.join(os.getcwd(), 'qrun'),
                         help="Directory in which db/session files are stored")
+    parser.add_argument('--cleanup', '-c', action='store_true', default=False,
+                        help="Wipe workdir before starting")
     return vars(parser.parse_args())
 
 
@@ -62,6 +65,8 @@ def config(workdir):
         f.write(USERS_TEMPLATE)
     subprocess.call(['sqlite3', '-init', sql, users_db, '.quit'])
 
+    trans_db = os.path.join(workdir, 'transactions.sqlite')
+
     with open(CONF_TEMPLATE) as f:
         conf_template = f.read()
     t = Template(conf_template)
@@ -69,6 +74,12 @@ def config(workdir):
                          'instance': 'idp',
                          'staticdir': os.getcwd(),
                          'datadir': workdir,
+                         'admindb': admin_db,
+                         'usersdb': users_db,
+                         'transdb': trans_db,
+                         'sesstype': 'file',
+                         'sessopt': 'path',
+                         'sessval': os.path.join(workdir, 'sessions'),
                          'secure': 'False'})
     conf = os.path.join(workdir, 'ipsilon.conf')
     with open(conf, 'w+') as f:
@@ -83,6 +94,10 @@ if __name__ == '__main__':
     penv.update(os.environ)
     penv['PYTHONPATH'] = './'
 
+
+    if args['cleanup']:
+        shutil.rmtree(args['workdir'])
+
     if not os.path.exists(args['workdir']):
         conf = config(args['workdir'])
     else: