diff --git a/addons/hr_holidays/tests/test_holidays_flow.py b/addons/hr_holidays/tests/test_holidays_flow.py index 9b678e426d0..5a5d51a098f 100644 --- a/addons/hr_holidays/tests/test_holidays_flow.py +++ b/addons/hr_holidays/tests/test_holidays_flow.py @@ -23,7 +23,7 @@ from datetime import datetime from dateutil.relativedelta import relativedelta from openerp.addons.hr_holidays.tests.common import TestHrHolidaysBase -from openerp.exceptions import Warning +from openerp.exceptions import Warning, AccessError from openerp.osv.orm import except_orm from openerp.tools import mute_logger @@ -46,7 +46,7 @@ class TestHolidaysFlow(TestHrHolidaysBase): 'hr_holidays: wrong type days computation') # HrUser creates some holiday statuses -> crash because only HrManagers should do this - with self.assertRaises(except_orm): + with self.assertRaises(AccessError): self.holidays_status_dummy = self.hr_holidays_status.create(cr, self.user_hruser_id, { 'name': 'UserCheats', 'limit': True, diff --git a/addons/portal_project/tests/test_access_rights.py b/addons/portal_project/tests/test_access_rights.py index d536b5891e2..5b389df809f 100644 --- a/addons/portal_project/tests/test_access_rights.py +++ b/addons/portal_project/tests/test_access_rights.py @@ -20,6 +20,7 @@ ############################################################################## from openerp.addons.project.tests.test_project_base import TestProjectBase +from openerp.exceptions import AccessError from openerp.osv.orm import except_orm from openerp.tools import mute_logger @@ -93,13 +94,13 @@ class TestPortalProject(TestPortalProjectBase): self.project_task.write(cr, self.user_projectuser_id, task_ids, {'description': 'TestDescription'}) # Do: Bert reads project -> crash, no group - self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) + self.assertRaises(AccessError, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) # Test: no project task visible - self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) + self.assertRaises(AccessError, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) # Test: no project task readable - self.assertRaises(except_orm, self.project_task.read, cr, self.user_none_id, task_ids, ['name']) + self.assertRaises(AccessError, self.project_task.read, cr, self.user_none_id, task_ids, ['name']) # Test: no project task writable - self.assertRaises(except_orm, self.project_task.write, cr, self.user_none_id, task_ids, {'description': 'TestDescription'}) + self.assertRaises(AccessError, self.project_task.write, cr, self.user_none_id, task_ids, {'description': 'TestDescription'}) # Do: Chell reads project -> ok (portal ok public) self.project_project.read(cr, self.user_portal_id, pigs_id, ['name']) @@ -110,7 +111,7 @@ class TestPortalProject(TestPortalProjectBase): # Test: all project tasks readable self.project_task.read(cr, self.user_portal_id, task_ids, ['name']) # Test: no project task writable - self.assertRaises(except_orm, self.project_task.write, cr, self.user_portal_id, task_ids, {'description': 'TestDescription'}) + self.assertRaises(AccessError, self.project_task.write, cr, self.user_portal_id, task_ids, {'description': 'TestDescription'}) # Do: Donovan reads project -> ok (public) self.project_project.read(cr, self.user_public_id, pigs_id, ['name']) @@ -121,7 +122,7 @@ class TestPortalProject(TestPortalProjectBase): # Test: all project tasks readable self.project_task.read(cr, self.user_public_id, task_ids, ['name']) # Test: no project task writable - self.assertRaises(except_orm, self.project_task.write, cr, self.user_public_id, task_ids, {'description': 'TestDescription'}) + self.assertRaises(AccessError, self.project_task.write, cr, self.user_public_id, task_ids, {'description': 'TestDescription'}) # ---------------------------------------- # CASE2: portal project @@ -136,9 +137,9 @@ class TestPortalProject(TestPortalProjectBase): 'access rights: project user cannot see all tasks of a portal project') # Do: Bert reads project -> crash, no group - self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) + self.assertRaises(AccessError, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) # Test: no project task searchable - self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) + self.assertRaises(AccessError, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) # Data: task follower self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id]) @@ -174,7 +175,7 @@ class TestPortalProject(TestPortalProjectBase): 'access rights: project user cannot see all tasks of an employees project') # Do: Bert reads project -> crash, no group - self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) + self.assertRaises(AccessError, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) # Do: Chell reads project -> ko (portal ko employee) self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_id, pigs_id, ['name']) @@ -202,7 +203,7 @@ class TestPortalProject(TestPortalProjectBase): 'access rights: employee user should not see tasks of a not-followed followers project, only assigned') # Do: Bert reads project -> crash, no group - self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) + self.assertRaises(AccessError, self.project_project.read, cr, self.user_none_id, pigs_id, ['name']) # Do: Chell reads project -> ko (portal ko employee) self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_id, pigs_id, ['name']) diff --git a/addons/portal_project_issue/tests/test_access_rights.py b/addons/portal_project_issue/tests/test_access_rights.py index f5060ccc1ff..eaa06a69538 100644 --- a/addons/portal_project_issue/tests/test_access_rights.py +++ b/addons/portal_project_issue/tests/test_access_rights.py @@ -20,6 +20,7 @@ ############################################################################## from openerp.addons.portal_project.tests.test_access_rights import TestPortalProjectBase +from openerp.exceptions import AccessError from openerp.osv.orm import except_orm from openerp.tools import mute_logger @@ -71,11 +72,11 @@ class TestPortalIssue(TestPortalProjectBase): # Do: Bert reads project -> crash, no group # Test: no project issue visible - self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) + self.assertRaises(AccessError, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) # Test: no project issue readable - self.assertRaises(except_orm, self.project_issue.read, cr, self.user_none_id, issue_ids, ['name']) + self.assertRaises(AccessError, self.project_issue.read, cr, self.user_none_id, issue_ids, ['name']) # Test: no project issue writable - self.assertRaises(except_orm, self.project_issue.write, cr, self.user_none_id, issue_ids, {'description': 'TestDescription'}) + self.assertRaises(AccessError, self.project_issue.write, cr, self.user_none_id, issue_ids, {'description': 'TestDescription'}) # Do: Chell reads project -> ok (portal ok public) # Test: all project issues visible @@ -85,7 +86,7 @@ class TestPortalIssue(TestPortalProjectBase): # Test: all project issues readable self.project_issue.read(cr, self.user_portal_id, issue_ids, ['name']) # Test: no project issue writable - self.assertRaises(except_orm, self.project_issue.write, cr, self.user_portal_id, issue_ids, {'description': 'TestDescription'}) + self.assertRaises(AccessError, self.project_issue.write, cr, self.user_portal_id, issue_ids, {'description': 'TestDescription'}) # Do: Donovan reads project -> ok (public ok public) # Test: all project issues visible @@ -106,7 +107,7 @@ class TestPortalIssue(TestPortalProjectBase): # Do: Bert reads project -> crash, no group # Test: no project issue searchable - self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) + self.assertRaises(AccessError, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)]) # Data: issue follower self.project_issue.message_subscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id]) diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py index a037c92d2ae..ecbe66a0cea 100644 --- a/addons/project/tests/test_project_flow.py +++ b/addons/project/tests/test_project_flow.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.addons.project.tests.test_project_base import TestProjectBase -from openerp.osv.orm import except_orm +from openerp.exceptions import AccessError from openerp.tools import mute_logger @@ -57,7 +57,7 @@ class TestProjectFlow(TestProjectBase): cr, uid, user_projectuser_id, user_projectmanager_id, project_pigs_id = self.cr, self.uid, self.user_projectuser_id, self.user_projectmanager_id, self.project_pigs_id # ProjectUser: set project as template -> raise - self.assertRaises(except_orm, self.project_project.set_template, cr, user_projectuser_id, [project_pigs_id]) + self.assertRaises(AccessError, self.project_project.set_template, cr, user_projectuser_id, [project_pigs_id]) # Other tests are done using a ProjectManager project = self.project_project.browse(cr, user_projectmanager_id, project_pigs_id)