Fix minor problems in tests

Make gpg test fault tolerant against existing directory.
Fix path problems for new auditor.

Author: schlatterbeck

test/gpgmelib.py

@@ -118,6 +118,9 @@
 
 pgphome = 'pgp-test-home'
 def setUpPGP():
+    # prevent test from failing if left over from earlier run:
+    if os.path.exists(pgphome):
+        shutil.rmtree(pgphome)
     os.mkdir(pgphome)
     os.environ['GNUPGHOME'] = pgphome
     # gpgme_check_version() must have been called once in a programm

test/memorydb.py

@@ -42,7 +42,8 @@ def create(journaltag, create=True, debug=False):
     execfile(initial_data, vars)
 
     # load standard detectors
-    dirname = os.path.join(os.path.dirname(__file__),
+    thisdir = os.path.dirname(__file__)
+    dirname = os.path.join(thisdir,
         '../share/roundup/templates/classic/detectors')
     for fn in os.listdir(dirname):
         if not fn.endswith('.py'): continue
@@ -51,7 +52,7 @@ def create(journaltag, create=True, debug=False):
         vars['init'](db)
 
     vars = {}
-    execfile("test/tx_Source_detector.py", vars)
+    execfile(os.path.join(thisdir, "tx_Source_detector.py"), vars)
     vars['init'](db)
 
     '''

test/test_cgi.py

@@ -86,13 +86,11 @@ def setUp(self):
 
         self.db.post_init()
 
-        vars = dict(globals())
-        vars['db'] = self.db
         vars = {}
-        execfile("test/tx_Source_detector.py", vars)
+        thisdir = os.path.dirname(__file__)
+        execfile(os.path.join(thisdir, "tx_Source_detector.py"), vars)
         vars['init'](self.db)
 
-
         test = self.instance.backend.Class(self.db, "test",
             string=hyperdb.String(), number=hyperdb.Number(),
             boolean=hyperdb.Boolean(), link=hyperdb.Link('test'),

test/test_xmlrpc.py

@@ -46,10 +46,9 @@ def setUp(self):
 
         self.db.post_init()
 
-        vars = dict(globals())
-        vars['db'] = self.db
+        thisdir = os.path.dirname(__file__)
         vars = {}
-        execfile("test/tx_Source_detector.py", vars)
+        execfile(os.path.join(thisdir, "tx_Source_detector.py"), vars)
         vars['init'](self.db)
 
         self.server = RoundupInstance(self.db, self.instance.actions, None)