[Erp5-report] r23314 - /erp5/trunk/products/ERP5Type/tests/SecurityTestCase.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep  1 09:58:17 2008
New Revision: 23314

URL: http://svn.erp5.org?rev=23314&view=rev
Log:
show the portal type of the document in failure messages

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

Modified: erp5/trunk/products/ERP5Type/tests/SecurityTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/SecurityTestCase.py?rev=23314&r1=23313&r2=23314&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/SecurityTestCase.py (original)
+++ erp5/trunk/products/ERP5Type/tests/SecurityTestCase.py Mon Sep  1 09:58:17 2008
@@ -69,11 +69,11 @@
         if hasattr(user, 'getGroups'):
           groups = user.getGroups()
         self._instance.fail(
-          'User %s does NOT have %s permission on %s (user roles: [%s], '
+          'User %s does NOT have %s permission on %s %s (user roles: [%s], '
           'roles needed: [%s], existing local roles: %s, '
           'your user groups: [%s])' %
-          (username, self._permission_name, document,
-           ', '.join(user.getRolesInContext(document)),
+          (username, self._permission_name, document.getPortalTypeName(),
+            document, ', '.join(user.getRolesInContext(document)),
            ', '.join([x['name'] for x in
                       document.rolesOfPermission(self._permission_name)
                       if x['selected']]),
@@ -101,9 +101,9 @@
       user = getSecurityManager().getUser()
       if user.has_permission(self._permission_name, document):
         self._instance.fail(
-          'User %s has %s permission on %s (roles: [%s])' %
-          (username, self._permission_name, document,
-            ', '.join(user.getRolesInContext(document))))
+          'User %s has %s permission on %s %s (roles: [%s])' %
+          (username, self._permission_name, document.getPortalTypeName(),
+            document, ', '.join(user.getRolesInContext(document))))
     except:
       setSecurityManager(sm)
 
@@ -179,8 +179,8 @@
                             self.workflow_tool.listActions(object=document) if
                             ai['category'] == 'workflow']
       if transition in valid_transistion_list:
-        self.fail('User %s can pass %s transition on %s. Roles: [%s]' % (
-                  username, transition, document,
+        self.fail('User %s can pass %s transition on %s %s. Roles: [%s]' % (
+                  username, transition, document.getPortalTypeName(), document,
                   ", ".join(user.getRolesInContext(document))))
     finally:
       setSecurityManager(sm)