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

Modified Files:
        test_user_ops.py 
Log Message:
intermediate

Index: test_user_ops.py
===================================================================
RCS file: /cvsroot/mailman/mailman3/src/mailman/tests/test_user_ops.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_user_ops.py    23 Apr 2004 05:26:13 -0000      1.2
+++ test_user_ops.py    24 Apr 2004 00:30:57 -0000      1.3
@@ -14,64 +14,68 @@
 # 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 stubuserstorage which implements IUserStorage
-"""
+"""Test backend ops on stubuserstorage which implements IUserStorage."""
 
 import os
 import unittest
 
+import mailman
+from mailman import startup
+from mailman import errors
+from mailman.config import configuration
+from mailman.dbmgr import dbmgr
 from mailman.interfaces.user import IUser
 from mailman.interfaces.storages import IUserStorage
+from mailman.stubbackend.stubimpl import stubuserstorage
 
-from mailman.config import configuration
-from mailman import startup
-from mailman.dbmgr import dbmgr
-from mailman import errors
+from protocols.api import adapt
 
-from mailman.stubbackend.stubimpl import stubuserstorage
 
-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'))
+
 class TestUserOps(unittest.TestCase):
-
     def test_create_user(self):
-        users = dbmgr.users
-        self.assert_(users)
-
-        domain = 'mydomain.com'
-        newUser = users.create_user(domain)
-        # according to the contract of create_user, u must
-        # implement IUser
-        self.assert_(newUser, "should have a new user")
-        
-        # now that the user is created, I should be able to get it by id
-        sameUser = users.get_user(newUser.uid, domain)
-        self.assertEqual(sameUser, newUser)
+        unless = self.failUnless
+        unless(dbmgr.users)
+        iuserstorage = adapt(dbmgr.users, IUserStorage)
+        unless(iuserstorage)
+        # Create a new user in a fake domain.
+        domain = 'example.com'
+        newuser = iuserstorage.create_user(domain)
+        # According to the contract of create_user, this must implement IUser
+        unless(newuser, 'should have a new user')
+        iuser = adapt(newuser, IUser)
+        unless(iuser)
+        # Now that the user is created, I should be able to get it by id
+        sameuser = iuserstorage.get_user(newuser.uid, domain)
+        self.assertEqual(sameuser, newuser)
 
     def test_bad_domain(self):
-        # request a user from a bogus domain
-        self.failUnlessRaises(errors.NoUserError,
-                              dbmgr.users.get_user,
-                              *[12000, 'baddomain'])
+        # Request a user from a bogus domain
+        self.assertRaises(errors.NoUserError,
+                          dbmgr.users.get_user, 12000, 'baddomain')
 
 
     def test_get_bogus_user(self):
-        # requsting a bogus user should result in a NoUserError being raised
-        self.failUnlessRaises(errors.NoUserError, 
-                              dbmgr.users.get_user,
-                              *[12000, 'mydomain.com'])
+        # Requsting a bogus user should result in a NoUserError being raised
+        self.assertRaises(errors.NoUserError,
+                          dbmgr.users.get_user, 12000, 'example.com')
 
 
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestUserOps))
     return suite
-        
+
+
+
 if __name__ == '__main__':
+    mmhere = os.path.abspath(os.path.dirname(mailman.__file__))
+    mmroot = os.path.normpath(os.path.join(mmhere, os.pardir, os.pardir))
+    conffile = os.path.normpath(
+        os.path.join(mmroot, 'etc/backendtest.conf'))
     configuration.configure(conffile)
-    # after the above line, dbmgr should know about our backend
-    # call everyone's initializer
+    # After the above line, dbmgr should know about our backend 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