devtools/testlib.py
changeset 10651 9ca33768473c
parent 10621 987fbc88f097
parent 10646 45671fb330f5
child 10662 10942ed172de
equal deleted inserted replaced
10622:3cc6154b94a3 10651:9ca33768473c
   526                 erschema = self.schema[erschema]
   526                 erschema = self.schema[erschema]
   527             for action, actionperms in etypeperms.iteritems():
   527             for action, actionperms in etypeperms.iteritems():
   528                 origperms = erschema.permissions[action]
   528                 origperms = erschema.permissions[action]
   529                 erschema.set_action_permissions(action, actionperms)
   529                 erschema.set_action_permissions(action, actionperms)
   530                 torestore.append([erschema, action, origperms])
   530                 torestore.append([erschema, action, origperms])
   531         yield
   531         try:
   532         for erschema, action, permissions in torestore:
   532             yield
   533             if action is None:
   533         finally:
   534                 erschema.permissions = permissions
   534             for erschema, action, permissions in torestore:
   535             else:
   535                 if action is None:
   536                 erschema.set_action_permissions(action, permissions)
   536                     erschema.permissions = permissions
       
   537                 else:
       
   538                     erschema.set_action_permissions(action, permissions)
   537 
   539 
   538     def assertModificationDateGreater(self, entity, olddate):
   540     def assertModificationDateGreater(self, entity, olddate):
   539         entity.cw_attr_cache.pop('modification_date', None)
   541         entity.cw_attr_cache.pop('modification_date', None)
   540         self.assertTrue(entity.modification_date > olddate)
   542         self.assertGreater(entity.modification_date, olddate)
   541 
   543 
   542     def assertMessageEqual(self, req, params, expected_msg):
   544     def assertMessageEqual(self, req, params, expected_msg):
   543         msg = req.session.data[params['_cwmsgid']]
   545         msg = req.session.data[params['_cwmsgid']]
   544         self.assertEqual(expected_msg, msg)
   546         self.assertEqual(expected_msg, msg)
   545 
   547