don't have mailgw tests close the db - they're not testing persistence

Author: Richard Jones

test/db_test_base.py

@@ -1863,6 +1863,9 @@ def setUp(self):
             shutil.rmtree(config.DATABASE)
         os.makedirs(config.DATABASE + '/files')
 
+    def open_database(self):
+        self.db = self.module.Database(config, 'admin')
+
     def test_reservedProperties(self):
         self.open_database()
         self.assertRaises(ValueError, self.module.Class, self.db, "a",

test/memorydb.py

@@ -184,7 +184,6 @@ def __init__(self, config, journaltag=None):
         self.sessions = Sessions()
         self.otks = OneTimeKeys()
         self.indexer = Indexer(self)
-        self.sessions = Sessions()
 
         # anydbm bits
         self.cache = {}         # cache of nodes loaded or created
@@ -193,7 +192,6 @@ def __init__(self, config, journaltag=None):
         self.destroyednodes = {}# keep track of the destroyed nodes by class
         self.transactions = []
 
-
     def filename(self, classname, nodeid, property=None, create=0):
         shutil.copyfile(__file__, __file__+'.dummy')
         return __file__+'.dummy'

test/test_mailgw.py

@@ -143,8 +143,16 @@ def tearDown(self):
             os.remove(SENDMAILDEBUG)
         self.db.close()
 
+    def _create_mailgw(self, message):
+        class MailGW(self.instance.MailGW):
+            def handle_message(self, message):
+                return self._handle_message(message)
+        handler = MailGW(self.instance)
+        handler.db = self.db
+        return handler
+
     def _handle_mail(self, message):
-        handler = self.instance.MailGW(self.instance)
+        handler = self._create_mailgw(message)
         handler.trapExceptions = 0
         return handler.main(StringIO(message))
 
@@ -582,7 +590,7 @@ def testPropertyChangeOnly(self):
         # reconstruct old behaviour: This would reuse the
         # database-handle from the doNewIssue above which has committed
         # as user "Chef". So we close and reopen the db as that user.
-        self.db.close()
+        #self.db.close() actually don't close 'cos this empties memorydb
         self.db = self.instance.open('Chef')
         self.db.issue.set('1', assignedto=self.chef_id)
         self.db.commit()
@@ -1032,6 +1040,7 @@ def testNosyRemove(self):
         assert not os.path.exists(SENDMAILDEBUG)
 
     def testNewUserAuthor(self):
+        self.db.commit()
         l = self.db.user.list()
         l.sort()
         message = '''Content-Type: text/plain;
@@ -1133,8 +1142,7 @@ def testUnknownUser(self):
 
 This is a test submission of a new issue.
 '''
-        self.db.close()
-        handler = self.instance.MailGW(self.instance)
+        handler = self._create_mailgw(message)
         # we want a bounce message:
         handler.trapExceptions = 1
         ret = handler.main(StringIO(message))