merge heads

Author: rouilj

roundup/backends/__init__.py

@@ -54,6 +54,9 @@ def have_backend(name):
         else:
             modname = e.args[0][16:] if e.args[0].startswith('No module named ') else None
 
+        # It's always ok if memorydb is not found
+        if modname.endswith('back_memorydb'):
+            return 0
         if modname and (modname in _modules.get(name, (name,))):
             return 0
         raise
@@ -65,9 +68,15 @@ def list_backends():
     This function has side-effect of registering backward-compatible
     globals for all available backends.
 
+    Note: Since memorydb does not live in the backends directory, it will
+    never be found in the default setup. It *can* be enabled by preloading
+    test/memorydb and injecting into roundup.backends. So the normal user
+    can never configure memorydb but it makes using the tests easier
+    because we do not need to monkey-patch list_backends.
+
     '''
     l = []
-    for name in 'anydbm', 'mysql', 'sqlite', 'postgresql':
+    for name in 'anydbm', 'mysql', 'sqlite', 'postgresql', 'memorydb':
         if have_backend(name):
             l.append(name)
     return l

roundup/test/memorydb.py

@@ -38,6 +38,9 @@ def new_config(debug=False, prefix=default_prefix):
     return config
 
 def create(journaltag, create=True, debug=False, prefix=default_prefix):
+    # "Nuke" in-memory db
+    db_nuke('')
+
     db = Database(new_config(debug), journaltag)
 
     # load standard schema
@@ -214,12 +217,12 @@ class Database(back_anydbm.Database):
 
     dbtype = "memorydb"
 
+    # Make it a little more persistent across re-open
+    memdb = {}
+
     def __init__(self, config, journaltag=None):
         self.config, self.journaltag = config, journaltag
         self.classes = {}
-        self.items = {}
-        self.ids = {}
-        self.journals = {}
         self.files = {}
         self.tx_files = {}
         self.security = security.Security(self)
@@ -236,6 +239,10 @@ def __init__(self, config, journaltag=None):
         self.destroyednodes = {}# keep track of the destroyed nodes by class
         self.transactions = []
         self.tx_Source = None
+        # persistence across re-open
+        self.items = self.__class__.memdb.get('items', {})
+        self.ids = self.__class__.memdb.get('ids', {})
+        self.journals = self.__class__.memdb.get('journals', {})
 
     def filename(self, classname, nodeid, property=None, create=0):
         shutil.copyfile(__file__, __file__+'.dummy')
@@ -290,6 +297,10 @@ def close(self):
         # kill the schema too
         self.classes = {}
         # just keep the .items
+        # persistence across re-open
+        self.__class__.memdb['items'] = self.items
+        self.__class__.memdb['ids'] = self.ids
+        self.__class__.memdb['journals'] = self.journals
 
     #
     # Classes
@@ -472,4 +483,13 @@ def __init__(self, db, classname, **properties):
             properties['superseder'] = hyperdb.Multilink(classname)
         Class.__init__(self, db, classname, **properties)
 
+# Methods to check for existence and nuke the db
+# We don't support multiple named databases
+
+def db_exists(name):
+    return bool(Database.memdb)
+
+def db_nuke(name):
+    Database.memdb = {}
+
 # vim: set et sts=4 sw=4 :

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

@@ -45,7 +45,7 @@
 from roundup.anypy.cmp_ import NoneAndDictComparable
 from roundup.anypy.email_ import message_from_bytes
 
-from .mocknull import MockNull
+from roundup.test.mocknull import MockNull
 
 config = configuration.CoreConfig()
 config.DATABASE = "db"
@@ -1379,15 +1379,13 @@ def testJournalNonexistingProperty(self):
             self.assertEqual(result [4][4], jp3)
         self.db.close()
         # Verify that normal user doesn't see obsolete props/classes
-        # Backend memorydb cannot re-open db for different user
-        if self.db.dbtype != 'memorydb':
-            self.open_database('mary')
-            setupSchema(self.db, 0, self.module)
-            # allow mary to see issue fields like title
-            self.db.security.addPermissionToRole('User', 'View', 'issue')
-            result=self.db.issue.history(id)
-            self.assertEqual(len(result), 2)
-            self.assertEqual(result [1][4], jp0)
+        self.open_database('mary')
+        setupSchema(self.db, 0, self.module)
+        # allow mary to see issue fields like title
+        self.db.security.addPermissionToRole('User', 'View', 'issue')
+        result=self.db.issue.history(id)
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result [1][4], jp0)
 
     def testJournalPreCommit(self):
         id = self.db.user.create(username="mary")

test/db_test_base.py

@@ -44,7 +44,7 @@ def dst(self, dt):
 
 from .db_test_base import setupTracker
 
-from .mocknull import MockNull
+from roundup.test.mocknull import MockNull
 
 from io import BytesIO
 import json

test/rest_common.py

@@ -13,7 +13,7 @@
 from time import sleep
 from datetime import datetime
 
-from .mocknull import MockNull
+from roundup.test.mocknull import MockNull
 
 def true(*args, **kwargs):
     return 1

test/test_actions.py

@@ -28,7 +28,7 @@
 # For testing very simple rendering
 from roundup.cgi.engine_zopetal import RoundupPageTemplate
 
-from .mocknull import MockNull
+from roundup.test.mocknull import MockNull
 
 from . import db_test_base
 from .db_test_base import FormTestParent, setupTracker, FileUpload

test/test_cgi.py

@@ -223,6 +223,7 @@ def tearDown(self):
         if os.path.exists(SENDMAILDEBUG):
             os.remove(SENDMAILDEBUG)
         self.db.close()
+        memorydb.db_nuke('')
 
     def _allowAnonymousSubmit(self):
         p = [

test/test_mailgw.py

@@ -10,12 +10,14 @@ class memorydbOpener:
 
     def nuke_database(self):
         # really kill it
+        memorydb.db_nuke('')
         self.db = None
 
     db = None
-    def open_database(self):
-        if self.db is None:
-            self.db = self.module.Database(config, 'admin')
+    def open_database(self, user='admin'):
+        if self.db:
+            self.db.close()
+        self.db = self.module.Database(config, user)
         return self.db
 
     def setUp(self):
@@ -25,6 +27,8 @@ def setUp(self):
     def tearDown(self):
         if self.db is not None:
             self.db.close()
+            self.db = None
+        self.nuke_database()
 
     # nuke and re-create db for restore
     def nukeAndCreate(self):