4 files changed, 78 insertions, 1 deletions

diff --git a/src/mailman/app/lifecycle.py b/src/mailman/app/lifecycle.py
index 2b063d21d..6e50de9fe 100644
--- a/src/mailman/app/lifecycle.py
+++ b/src/mailman/app/lifecycle.py
@@ -91,7 +91,7 @@ def remove_list(fqdn_listname, mailing_list=None, archives=True):
     """Remove the list and all associated artifacts and subscriptions."""
     removeables = []
     # mailing_list will be None when only residual archives are being removed.
-    if mailing_list:
+    if mailing_list is not None:
         # Remove all subscriptions, regardless of role.
         for member in mailing_list.subscribers.members:
             member.unsubscribe()
diff --git a/src/mailman/tests/test_membership.py b/src/mailman/tests/test_membership.py
index 7ad5ad3e7..175dba8ba 100644
--- a/src/mailman/tests/test_membership.py
+++ b/src/mailman/tests/test_membership.py
@@ -29,8 +29,10 @@ import time
 import unittest
 
 from mailman import passwords
+from mailman.app.lifecycle import create_list, remove_list
 from mailman.config import config
 from mailman.interfaces.member import NotAMemberError
+from mailman.testing.layers import ConfigLayer
 
 
 
@@ -40,6 +42,14 @@ def password(cleartext):
 
 
 class TestNoMembers(unittest.TestCase):
+    layer = ConfigLayer
+
+    def setUp(self):
+        self._mlist = create_list('test@example.com')
+
+    def tearDown(self):
+        remove_list(self._mlist.fqdn_listname, self._mlist)
+
     def test_no_member(self):
         eq = self.assertEqual
         raises = self.assertRaises
@@ -389,4 +399,7 @@ class TestMembers(unittest.TestCase):
 
 def test_suite():
     suite = unittest.TestSuite()
+    # XXX 2010-05-06 None of these tests work.
+    ## suite.addTest(unittest.makeSuite(TestNoMembers))
+    ## suite.addTest(unittest.makeSuite(TestMembers))
     return suite
diff --git a/src/mailman/utilities/tests/__init__.py b/src/mailman/utilities/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/mailman/utilities/tests/__init__.py
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
new file mode 100644
index 000000000..4f4780339
--- /dev/null
+++ b/src/mailman/utilities/tests/test_import.py
@@ -0,0 +1,64 @@
+# Copyright (C) 2010 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for config.pck imports."""
+
+from __future__ import absolute_import, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'test_suite',
+    ]
+
+
+import cPickle
+import unittest
+
+from mailman.app.lifecycle import create_list, remove_list
+from mailman.testing.layers import ConfigLayer
+from mailman.utilities.importer import import_config_pck
+from pkg_resources import resource_filename
+
+
+
+class TestBasicImport(unittest.TestCase):
+    layer = ConfigLayer
+
+    def setUp(self):
+        self._mlist = create_list('blank@example.com')
+        pickle_file = resource_filename('mailman.testing', 'config.pck')
+        with open(pickle_file) as fp:
+            self._pckdict = cPickle.load(fp)
+
+    def tearDown(self):
+        remove_list(self._mlist.fqdn_listname, self._mlist)
+
+    def _import(self):
+        import_config_pck(self._mlist, self._pckdict)
+
+    def test_real_name(self):
+        # The mlist.real_name gets set.
+        self.assertEqual(self._mlist.real_name, 'Blank')
+        self._import()
+        self.assertEqual(self._mlist.real_name, 'Test')
+
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestBasicImport))
+    return suite