Fix roundup/test

Move the test-detectors in tx_Source_detector.py to roundup/test for two
reasons: It's used in the memorydb convenience functions and it may be
useful in other tests. Make the prefix a paramter of the convenience
functions to be usable in other tests.

Author: schlatterbeck

CHANGES.txt

@@ -102,8 +102,11 @@ Features:
 - Allow admin to configure language used for stemming in xapian
   indexer. (John Rouillard request by Nagy Gabor)
 - Move memorydb from test to roundup/test to allow regression-testing in
-  tracker instances without copying code.
-
+  tracker instances without copying code. Also move the test-detectors in
+  tx_Source_detector.py to roundup/test for two reasons: It's used in the
+  memorydb convenience functions and it may be useful in other tests. Make
+  the prefix a paramter of the convenience functions to be usable in other
+  tests.
 
 2020-07-13 2.0.0
 

roundup/test/memorydb.py

@@ -16,11 +16,18 @@
 from roundup.backends import indexer_common
 from roundup.support import ensureParentsExist
 from roundup.anypy.strings import s2b
+from roundup.test.tx_Source_detector import init as tx_Source_init
 
-def new_config(debug=False):
+default_prefix = '../../share/roundup/templates/classic'
+
+def new_config(debug=False, prefix=default_prefix):
+    if not prefix.startswith('/'):
+        prefix = os.path.join (os.path.dirname(__file__), prefix)
     config = configuration.CoreConfig()
-    config.detectors = configuration.UserConfig("share/roundup/templates/classic/detectors/config.ini")
-    config.ext = configuration.UserConfig("share/roundup/templates/classic/extensions/config.ini")
+    config.detectors = configuration.UserConfig(
+        os.path.join(prefix, "detectors/config.ini"))
+    config.ext = configuration.UserConfig(
+        os.path.join(prefix, "extensions/config.ini"))
     config.DATABASE = "db"
     #config.logging = MockNull()
     # these TRACKER_WEB and MAIL_DOMAIN values are used in mailgw tests
@@ -30,39 +37,34 @@ def new_config(debug=False):
     config.TRACKER_WEB = "http://tracker.example/cgi-bin/roundup.cgi/bugs/"
     return config
 
-def create(journaltag, create=True, debug=False):
+def create(journaltag, create=True, debug=False, prefix=default_prefix):
     db = Database(new_config(debug), journaltag)
 
     # load standard schema
-    schema = os.path.join(os.path.dirname(__file__),
-        '../share/roundup/templates/classic/schema.py')
+    if not prefix.startswith('/'):
+        prefix = os.path.join (os.path.dirname(__file__), prefix)
+    schema = os.path.join(prefix, 'schema.py')
     vars = hyperdb.__dict__
     vars['Class'] = Class
     vars['FileClass'] = FileClass
     vars['IssueClass'] = IssueClass
     vars['db'] = db
     exec(compile(open(schema).read(), schema, 'exec'), vars)
-    initial_data = os.path.join(os.path.dirname(__file__),
-        '../share/roundup/templates/classic/initial_data.py')
+    initial_data = os.path.join(prefix, 'initial_data.py')
     vars = dict(db=db, admin_email='[email protected]',
         adminpw=password.Password('sekrit'))
     exec(compile(open(initial_data).read(), initial_data, 'exec'), vars)
 
     # load standard detectors
-    thisdir = os.path.dirname(__file__)
-    dirname = os.path.join(thisdir,
-        '../share/roundup/templates/classic/detectors')
+    dirname = os.path.join(prefix, 'detectors')
     for fn in os.listdir(dirname):
         if not fn.endswith('.py'): continue
         vars = {}
         exec(compile(open(os.path.join(dirname, fn)).read(),
                      os.path.join(dirname, fn), 'exec'), vars)
         vars['init'](db)
 
-    vars = {}
-    exec(compile(open(os.path.join(thisdir, "tx_Source_detector.py")).read(),
-                 os.path.join(thisdir, "tx_Source_detector.py"), 'exec'), vars)
-    vars['init'](db)
+    tx_Source_init(db)
 
     '''
     status = Class(db, "status", name=String())

test/tx_Source_detector.py roundup/test/tx_Source_detector.pytest/tx_Source_detector.py renamed to roundup/test/tx_Source_detector.py

@@ -7,6 +7,7 @@
 
 from time import sleep
 from datetime import datetime, timedelta
+from roundup.test.tx_Source_detector import init as tx_Source_init
 
 try:
     from datetime import timezone
@@ -230,12 +231,7 @@ def setUp(self):
 
         self.db.post_init()
 
-        thisdir = os.path.dirname(__file__)
-        vars = {}
-        with open(os.path.join(thisdir, "tx_Source_detector.py")) as f:
-            code = compile(f.read(), "tx_Source_detector.py", "exec")
-            exec(code, vars)
-        vars['init'](self.db)
+        tx_Source_init(self.db)
 
         env = {
             'PATH_INFO': 'http://localhost/rounduptest/rest/',

test/rest_common.py

@@ -21,6 +21,7 @@
 from roundup.cgi.form_parser import FormParser
 from roundup import init, instance, password, hyperdb, date
 from roundup.anypy.strings import u2s, b2s, s2b
+from roundup.test.tx_Source_detector import init as tx_Source_init
 
 from time import sleep
 
@@ -83,13 +84,7 @@ class FormTestCase(FormTestParent, StringFragmentCmpHelper, unittest.TestCase):
     def setUp(self):
         FormTestParent.setUp(self)
 
-        vars = {}
-        thisdir = os.path.dirname(__file__)
-        exec(compile(open(os.path.join(thisdir,
-                                       "tx_Source_detector.py")).read(),
-                     os.path.join(thisdir, "tx_Source_detector.py"), 'exec'),
-             vars)
-        vars['init'](self.db)
+        tx_Source_init(self.db)
 
         test = self.instance.backend.Class(self.db, "test",
             string=hyperdb.String(), number=hyperdb.Number(),

test/test_cgi.py

@@ -41,7 +41,7 @@
 from roundup import init, instance, password, __version__
 
 #import db_test_base
-from . import memorydb
+from roundup.test import memorydb
 from .cmp_helper import StringFragmentCmpHelper
 
 def expectedFailure(method):

test/test_mailgw.py

@@ -15,6 +15,7 @@
 from roundup.backends import list_backends
 from roundup.hyperdb import String
 from roundup.cgi import TranslationService
+from roundup.test.tx_Source_detector import init as tx_Source_init
 
 from . import db_test_base
 from .test_mysql import skip_mysql
@@ -51,13 +52,7 @@ def setUp(self):
 
         self.db.post_init()
 
-        thisdir = os.path.dirname(__file__)
-        vars = {}
-        exec(compile(open(os.path.join(thisdir,
-                                       "tx_Source_detector.py")).read(),
-                     os.path.join(thisdir, "tx_Source_detector.py"), 'exec'),
-             vars)
-        vars['init'](self.db)
+        tx_Source_init(self.db)
 
         self.server = RoundupInstance(self.db, self.instance.actions, None)