devtools/testlib.py
changeset 10646 45671fb330f5
parent 10562 0c492a2720f1
parent 10639 1ed205146ee2
child 10651 9ca33768473c
child 10957 2fdf67ef3341
equal deleted inserted replaced
10645:57c60a96de70 10646:45671fb330f5
   524                 erschema = self.schema[erschema]
   524                 erschema = self.schema[erschema]
   525             for action, actionperms in etypeperms.iteritems():
   525             for action, actionperms in etypeperms.iteritems():
   526                 origperms = erschema.permissions[action]
   526                 origperms = erschema.permissions[action]
   527                 erschema.set_action_permissions(action, actionperms)
   527                 erschema.set_action_permissions(action, actionperms)
   528                 torestore.append([erschema, action, origperms])
   528                 torestore.append([erschema, action, origperms])
   529         yield
   529         try:
   530         for erschema, action, permissions in torestore:
   530             yield
   531             if action is None:
   531         finally:
   532                 erschema.permissions = permissions
   532             for erschema, action, permissions in torestore:
   533             else:
   533                 if action is None:
   534                 erschema.set_action_permissions(action, permissions)
   534                     erschema.permissions = permissions
       
   535                 else:
       
   536                     erschema.set_action_permissions(action, permissions)
   535 
   537 
   536     def assertModificationDateGreater(self, entity, olddate):
   538     def assertModificationDateGreater(self, entity, olddate):
   537         entity.cw_attr_cache.pop('modification_date', None)
   539         entity.cw_attr_cache.pop('modification_date', None)
   538         self.assertTrue(entity.modification_date > olddate)
   540         self.assertGreater(entity.modification_date, olddate)
   539 
   541 
   540     def assertMessageEqual(self, req, params, expected_msg):
   542     def assertMessageEqual(self, req, params, expected_msg):
   541         msg = req.session.data[params['_cwmsgid']]
   543         msg = req.session.data[params['_cwmsgid']]
   542         self.assertEqual(expected_msg, msg)
   544         self.assertEqual(expected_msg, msg)
   543 
   545