1 files changed, 32 insertions, 10 deletions

diff --git a/Mailman/testing/base.py b/Mailman/testing/base.py
index cb0a78819..a61740956 100644
--- a/Mailman/testing/base.py
+++ b/Mailman/testing/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,6 +18,8 @@
 """Test base class which handles creating and deleting a test list."""
 
 import os
+import grp
+import pwd
 import stat
 import shutil
 import difflib
@@ -25,19 +27,25 @@ import tempfile
 import unittest
 
 from cStringIO import StringIO
+from sqlalchemy.orm import clear_mappers
 
 from Mailman import MailList
 from Mailman import Utils
 from Mailman.bin import rmlist
 from Mailman.configuration import config
+from Mailman.database.dbcontext import dbcontext
 
 NL = '\n'
-PERMISSIONS = stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH
 
 
 
 class TestBase(unittest.TestCase):
     def _configure(self, fp):
+        # Make sure that we don't pollute the real database with our test
+        # mailing list.
+        test_engine_url = 'sqlite:///' + self._dbfile
+        print >> fp, 'SQLALCHEMY_ENGINE_URL = "%s"' % test_engine_url
+        config.SQLALCHEMY_ENGINE_URL = test_engine_url
         print >> fp, 'add_domain("example.com", "www.example.com")'
         # Only add this domain once to the current process
         if 'example.com' not in config.domains:
@@ -54,24 +62,37 @@ class TestBase(unittest.TestCase):
             raise self.failureException(fp.getvalue())
 
     def setUp(self):
+        mailman_uid = pwd.getpwnam(config.MAILMAN_USER).pw_uid
+        mailman_gid = grp.getgrnam(config.MAILMAN_GROUP).gr_gid
         # Write a temporary configuration file, but allow for subclasses to
-        # add additional data.
-        fd, self._config = tempfile.mkstemp(suffix='.cfg')
+        # add additional data.  Make sure the config and db files, which
+        # mkstemp creates, has the proper ownership and permissions.
+        fd, self._config = tempfile.mkstemp(dir=config.DATA_DIR, suffix='.cfg')
         os.close(fd)
+        os.chmod(self._config, 0440)
+        os.chown(self._config, mailman_uid, mailman_gid)
+        fd, self._dbfile = tempfile.mkstemp(dir=config.DATA_DIR, suffix='.db')
+        os.close(fd)
+        os.chmod(self._dbfile, 0660)
+        os.chown(self._dbfile, mailman_uid, mailman_gid)
         fp = open(self._config, 'w')
         try:
             self._configure(fp)
         finally:
             fp.close()
-        os.chmod(self._config, PERMISSIONS)
+        # Be sure to close the connection to the current database, and then
+        # reconnect to the new temporary SQLite database.  Otherwise we end up
+        # with turds in the main database and our qrunner subprocesses won't
+        # find the mailing list.  Because our global config object's
+        # SQLALCHEMY_ENGINE_URL variable has already been updated, the
+        # connect() call will open the database file the qrunners will be
+        # rendezvousing on.
+        dbcontext.close()
+        clear_mappers()
+        dbcontext.connect()
         mlist = MailList.MailList()
         mlist.Create('_xtest@example.com', 'owner@example.com', 'xxxxx')
         mlist.Save()
-        # We need to reload the mailing list to ensure that the member
-        # adaptors are all sync'd up.  This isn't strictly necessary with the
-        # OldStyleMemberships adaptor, but it may be required for other
-        # adaptors
-        mlist.Load()
         # This leaves the list in a locked state
         self._mlist = mlist
 
@@ -80,3 +101,4 @@ class TestBase(unittest.TestCase):
         rmlist.delete_list(self._mlist.fqdn_listname, self._mlist,
                            archives=True, quiet=True)
         os.unlink(self._config)
+        os.unlink(self._dbfile)