[FIX] check_access does not return bool, it raises

bzr revid: alexandre.fayolle@camptocamp.com-20130523055345-gg007ad9j457l0gl

diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml
index 06d927a..95a499a 100644 (file)
--- a/addons/mrp/test/multicompany.yml
+++ b/addons/mrp/test/multicompany.yml
@@ -13,4 +13,7 @@
     defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
     for field in fields:
         if defaults[field] != False:
-            assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field
+            try:
+                location_obj.check_access_rule(cr, uid, defaults[field], 'read', context)
+            except Exception, exc:
+                assert False, "unreadable location %s: %s" % (field, exc)

diff --git a/addons/stock/test/multicompany.yml b/addons/stock/test/multicompany.yml
index 8b65849..bab3638 100644 (file)
--- a/addons/stock/test/multicompany.yml
+++ b/addons/stock/test/multicompany.yml
@@ -16,7 +16,10 @@
         defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
         for field in fields:
             if defaults[field] != False:
-                assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable location %s" % field
+                try:
+                    location_obj.check_access_rule(cr, uid, defaults[field], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable location %s: %s" % (field, exc)
         assert defaults['type'] == type, "wrong move type"
 
 -
@@ -29,7 +32,10 @@
         result = self.onchange_move_type(cr, uid, [], type, context)['value']
         for field in fields:
             if defaults[field] != False:
-                assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field
+                try:
+                    location_obj.check_access_rule(cr, uid, defaults[field], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable location %s: %s" % (field, exc)
 
 -
   check default location readability for stock_fill_inventory in multicompany setting
@@ -38,7 +44,10 @@
     location_obj = self.pool.get('stock.location')
     defaults = self.default_get(cr, uid, ['location_id'], context)
     if defaults['location_id'] != False:
-        assert location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read', context), "unreadable default source location"
+        try:
+            location_obj.check_access_rule(cr, uid, defaults['location_id'], 'read'
+        except Exception, exc:
+            assert False, "unreadable source location: %s" % exc
 
 -
   check default locations for warehouse in multicompany setting
@@ -49,4 +58,7 @@
     for field in fields:
         for field in fields:
             if defaults[field] != False:
-                assert location_obj.check_access_rule(cr, uid, defaults[field], 'read', context), "unreadable default %s" % field
+                try:
+                    location_obj.check_access_rule(cr, uid, defaults[field], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable default %s: %s" % (field, exc)