[Erp5-report] r17638 - /erp5/trunk/products/ERP5Type/tests/testERP5Type.py

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Nov 15 18:12:06 2007
New Revision: 17638

URL: http://svn.erp5.org?rev=17638&view=rev
Log:
Stop to use unofficial api.

Modified:
    erp5/trunk/products/ERP5Type/tests/testERP5Type.py

Modified: erp5/trunk/products/ERP5Type/tests/testERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testERP5Type.py?rev=17638&r1=17637&r2=17638&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testERP5Type.py (original)
+++ erp5/trunk/products/ERP5Type/tests/testERP5Type.py Thu Nov 15 18:12:06 2007
@@ -136,13 +136,6 @@
       # filter content types to add inside Person.
       self.getTypesTool().getTypeInfo('Person').filter_content_types = 0
 
-      # turn on Person.acquire_local_roles only for test_22_securityReindex.
-      if str(self).startswith('test_22_securityReindex'):
-        person = self.getTypesTool().getTypeInfo('Person')
-        self.person_acquire_local_roles = person.acquire_local_roles
-        person.acquire_local_roles = True
-        self.portal.portal_caches.clearAllCache()
-
     def beforeTearDown(self):
       get_transaction().abort()
       for module in [ self.getPersonModule(),
@@ -150,8 +143,8 @@
                       self.getCategoryTool().region ]:
         module.manage_delObjects(list(module.objectIds()))
 
-      # turn off Person.acquire_local_roles only for test_22_securityReindex.
-      if str(self).startswith('test_22_securityReindex'):
+      # set Person.acquire_local_roles back.
+      if getattr(self, 'person_acquire_local_roles', None) is not None:
         self.getTypesTool().getTypeInfo('Person').acquire_local_roles = self.person_acquire_local_roles
         self.portal.portal_caches.clearAllCache()
 
@@ -1185,8 +1178,15 @@
       Note: Turn on Person.acquire_local_roles to 0 in afterSetUp.
       """
       if not run: return
+
       from AccessControl import getSecurityManager
       portal = self.getPortal()
+
+      # turn on Person.acquire_local_roles
+      person = self.getTypesTool().getTypeInfo('Person')
+      self.person_acquire_local_roles = person.acquire_local_roles
+      person.acquire_local_roles = True
+      portal.portal_caches.clearAllCache()
 
       # Make a plain user.
       uf = portal.acl_users