[Checkins] SVN: Products.PluggableAuthService/trunk/Products/PluggableAuthService/ Fixed tests so they run with Zope 2.11.

Michael Howitz mh at gocept.com
Thu Sep 4 02:24:24 EDT 2008


Log message for revision 90784:
  Fixed tests so they run with Zope 2.11.
  

Changed:
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py

-=-
Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2008-09-04 06:02:10 UTC (rev 90783)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/doc/CHANGES.txt	2008-09-04 06:24:24 UTC (rev 90784)
@@ -23,7 +23,9 @@
 - Ensure ZODBRoleManagerExportImport doesn't fail if it tries to add a
   role that already exists (idempotence is desirable in GS importers)
 
+- Fixed tests so they run with Zope 2.11.
 
+
 PluggableAuthService 1.5.2 (2007-11-28)
 ---------------------------------------
 

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py	2008-09-04 06:02:10 UTC (rev 90783)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_DynamicGroupsPlugin.py	2008-09-04 06:24:24 UTC (rev 90784)
@@ -494,10 +494,12 @@
         # Fails with a GET
         # test removeGroup
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, dpg.removeGroup,
                           GROUP_ID, REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         dpg.removeGroup(GROUP_ID, REQUEST=req)
 
 if __name__ == "__main__":

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py	2008-09-04 06:02:10 UTC (rev 90783)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBGroupManager.py	2008-09-04 06:24:24 UTC (rev 90784)
@@ -282,40 +282,50 @@
         # test addPrincipalToGroup
         # Fails with a GET
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zgm.addPrincipalToGroup,
                           USER_ID, GROUP_ID, REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zgm.addPrincipalToGroup(USER_ID, GROUP_ID, REQUEST=req)
 
         # test removePrincipalFromGroup
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zgm.removePrincipalFromGroup,
                           USER_ID, GROUP_ID, REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zgm.removePrincipalFromGroup(USER_ID, GROUP_ID, REQUEST=req)
 
         # test manage_addPrincipalsToGroup
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zgm.manage_addPrincipalsToGroup,
                           GROUP_ID, [USER_ID], REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zgm.manage_addPrincipalsToGroup(GROUP_ID, [USER_ID], REQUEST=req)
 
         # test manage_removePrincipalsFromGroup
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zgm.manage_removePrincipalsFromGroup,
                           GROUP_ID, [USER_ID], REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zgm.manage_removePrincipalsFromGroup(GROUP_ID, [USER_ID], REQUEST=req)
 
         # test manage_removeGroup
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zgm.manage_removeGroups,
                           [GROUP_ID], REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zgm.manage_removeGroups([GROUP_ID], REQUEST=req)
 
 if __name__ == "__main__":

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py	2008-09-04 06:02:10 UTC (rev 90783)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBRoleManager.py	2008-09-04 06:24:24 UTC (rev 90784)
@@ -489,24 +489,30 @@
         # Fails with a GET
         # test assignRoleToPrincipal
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.assignRoleToPrincipal,
                           ROLE_ID, USER_ID, REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.assignRoleToPrincipal(ROLE_ID, USER_ID, REQUEST=req)
 
         # test removeRoleFromPricipal
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.removeRoleFromPrincipal,
                           ROLE_ID, USER_ID, REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.removeRoleFromPrincipal(ROLE_ID, USER_ID, REQUEST=req)
 
         # test removeRole
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.removeRole,
                           ROLE_ID, REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.removeRole(ROLE_ID, REQUEST=req)
 
         # Readd the role for the manage_* methods
@@ -514,25 +520,31 @@
 
         # test manage_assignRoleToPrincipal
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.manage_assignRoleToPrincipals,
                           ROLE_ID, [USER_ID], RESPONSE=res, REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.manage_assignRoleToPrincipals(ROLE_ID, [USER_ID], RESPONSE=res,
                                           REQUEST=req)
 
         # test manage_removeRoleFromPricipal
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.manage_removeRoleFromPrincipals,
                           ROLE_ID, [USER_ID], RESPONSE=res, REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.manage_removeRoleFromPrincipals(ROLE_ID, [USER_ID], RESPONSE=res,
                                             REQUEST=req)
 
         # test manage_removeRoles
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zrm.manage_removeRoles,
                           [ROLE_ID], RESPONSE=res, REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zrm.manage_removeRoles([ROLE_ID], RESPONSE=res, REQUEST=req)
 
 

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py	2008-09-04 06:02:10 UTC (rev 90783)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py	2008-09-04 06:24:24 UTC (rev 90784)
@@ -596,23 +596,28 @@
         # test manage_updateUserPassword
         # Fails with a GET
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zum.manage_updateUserPassword,
                           USER_ID, PASSWORD, PASSWORD, REQUEST=req)
         # Works with a POST
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zum.manage_updateUserPassword(USER_ID, PASSWORD, PASSWORD, REQUEST=req)
 
         # test manage_updatePassword
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zum.manage_updatePassword,
                           USER_ID, PASSWORD, PASSWORD, REQUEST=req)
         # XXX: This method is broken
 
         # test manage_removeUsers
         req.set('REQUEST_METHOD', 'GET')
+        req.set('method', 'GET')
         self.assertRaises(Forbidden, zum.manage_removeUsers,
                           [USER_ID], REQUEST=req)
         req.set('REQUEST_METHOD', 'POST')
+        req.set('method', 'POST')
         zum.manage_removeUsers([USER_ID], REQUEST=req)
 
 



More information about the Checkins mailing list