Update of /cvsroot/mailman/mailman3/src/mailman/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26526

Modified Files:
        test_subscription.py 
Log Message:
Use the new ConfigTestBase class for simplified testing.


Index: test_subscription.py
===================================================================
RCS file: /cvsroot/mailman/mailman3/src/mailman/tests/test_subscription.py,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- test_subscription.py        1 May 2004 02:46:24 -0000       3.1
+++ test_subscription.py        1 May 2004 17:53:42 -0000       3.2
@@ -14,68 +14,44 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 
-""" test backend ops on any backend which implements IUserStorage
-"""
+"""Test subscription operations."""
 
 import os
 import unittest
 
 from mailman.dbmgr import dbmgr
-from mailman.config import configuration
-from mailman import startup
-
-from mailman.interfaces.profile import DeliveryMode
+from mailman.tests.basetest import ConfigTestBase
 
 
 
-class TestSubscription(unittest.TestCase):
-
+class TestSubscription(ConfigTestBase):
     def setUp(self):
-        self._addr   = '[EMAIL PROTECTED]'
+        ConfigTestBase.setUp(self)
+        self._addr = '[EMAIL PROTECTED]'
         self._domain = 'myTestDomain'
         self._listid = '[EMAIL PROTECTED]'
 
     def test_create_subscription(self):
-        eq = self.assertEqual
         unless = self.failUnless
         addr = dbmgr.users.find_address(self._addr, self._domain)
         if not addr:
-            # create a new blank user
+            # Create a new blank user.
             user = dbmgr.users.create_user(self._domain)
             addr = user.add_address('default', self._addr)
-
-        # create the list if it doesn't already exist
-        txn = dbmgr.lists.begin()
-        try:
-            if not dbmgr.lists.list_exists(self._listid):
-                dbmgr.lists.create_list(self._listid)
-        except:
-            txn.abort()
-            raise
-        else:
-            txn.commit()
-
+        # Create the list if it doesn't already exist.
+        if not dbmgr.lists.list_exists(self._listid):
+            dbmgr.lists.create_list(self._listid)
         addr.subscribe(self._listid)
-        found = 0
+        found = False
         for sub in addr.get_subscriptions():
             if sub.listid == self._listid:
-                found = 1
+                found = True
                 break
-        eq(found, 1, "must find newly created subscription in list of "
-           "active subscriptions")
+        unless(found, 'Did not find newly created subscription in active list')
 
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestSubscription))
     return suite
-        
-if __name__ == '__main__':
-    here = os.path.abspath(os.path.dirname(__file__))
-    mmroot = os.path.normpath(os.path.join(here, '../../..'))
-    conffile = os.path.normpath(os.path.join(mmroot,
-                                             'etc/backendtest.conf'))
-    configuration.configure(conffile)
-    # after the above line, dbmgr should know about our backend.
-    # now call everyone's initializer
-    startup.startup()
-    unittest.main()


_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to