From 1da5b4e802d40e5f6ca43837f377b666aa140790 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Thu, 24 Feb 2022 09:24:50 +0000 Subject: [PATCH] [IMP] resource: Move test models in their own module Purpose ======= When creating resources, SQL request were made to this test table. Part-of: odoo/odoo#85133 --- addons/resource/__init__.py | 1 - addons/resource/security/ir.model.access.csv | 1 - addons/test_resource/__init__.py | 4 ++++ addons/test_resource/__manifest__.py | 16 ++++++++++++++++ addons/test_resource/models/__init__.py | 4 ++++ .../models/test_resource.py} | 0 .../test_resource/security/ir.model.access.csv | 2 ++ .../tests/__init__.py | 0 .../{resource => test_resource}/tests/common.py | 0 .../tests/test_performance.py | 0 .../tests/test_resource.py | 2 +- 11 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 addons/test_resource/__init__.py create mode 100644 addons/test_resource/__manifest__.py create mode 100644 addons/test_resource/models/__init__.py rename addons/{resource/tests/test_resource_model.py => test_resource/models/test_resource.py} (100%) create mode 100644 addons/test_resource/security/ir.model.access.csv rename addons/{resource => test_resource}/tests/__init__.py (100%) rename addons/{resource => test_resource}/tests/common.py (100%) rename addons/{resource => test_resource}/tests/test_performance.py (100%) rename addons/{resource => test_resource}/tests/test_resource.py (99%) diff --git a/addons/resource/__init__.py b/addons/resource/__init__.py index 44785a95139..9bf76e95831 100644 --- a/addons/resource/__init__.py +++ b/addons/resource/__init__.py @@ -3,4 +3,3 @@ from . import models from . import populate -from .tests import test_resource_model diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv index 02fcaa44e82..34ca64a5e94 100644 --- a/addons/resource/security/ir.model.access.csv +++ b/addons/resource/security/ir.model.access.csv @@ -7,4 +7,3 @@ access_resource_resource,resource.resource,model_resource_resource,base.group_sy access_resource_resource_all,resource.resource all,model_resource_resource,base.group_user,1,0,0,0 access_resource_calendar_leaves_user,resource.calendar.leaves,model_resource_calendar_leaves,base.group_user,1,1,1,1 access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1 -access_resource_test_all,resource.test.all,model_resource_test,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/addons/test_resource/__init__.py b/addons/test_resource/__init__.py new file mode 100644 index 00000000000..dc5e6b693d1 --- /dev/null +++ b/addons/test_resource/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/addons/test_resource/__manifest__.py b/addons/test_resource/__manifest__.py new file mode 100644 index 00000000000..cf04cf2fb9f --- /dev/null +++ b/addons/test_resource/__manifest__.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +{ + 'name': 'Test - Resource', + 'version': '1.1', + 'category': 'Hidden', + 'description': """""", + 'depends': ['resource'], + 'data': [ + 'security/ir.model.access.csv', + ], + 'demo': [], + 'assets': {}, + 'license': 'LGPL-3', +} diff --git a/addons/test_resource/models/__init__.py b/addons/test_resource/models/__init__.py new file mode 100644 index 00000000000..9ac03051d9d --- /dev/null +++ b/addons/test_resource/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import test_resource diff --git a/addons/resource/tests/test_resource_model.py b/addons/test_resource/models/test_resource.py similarity index 100% rename from addons/resource/tests/test_resource_model.py rename to addons/test_resource/models/test_resource.py diff --git a/addons/test_resource/security/ir.model.access.csv b/addons/test_resource/security/ir.model.access.csv new file mode 100644 index 00000000000..ee85fbe2325 --- /dev/null +++ b/addons/test_resource/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_resource_test_all,resource.test.all,model_resource_test,base.group_user,1,1,1,1 diff --git a/addons/resource/tests/__init__.py b/addons/test_resource/tests/__init__.py similarity index 100% rename from addons/resource/tests/__init__.py rename to addons/test_resource/tests/__init__.py diff --git a/addons/resource/tests/common.py b/addons/test_resource/tests/common.py similarity index 100% rename from addons/resource/tests/common.py rename to addons/test_resource/tests/common.py diff --git a/addons/resource/tests/test_performance.py b/addons/test_resource/tests/test_performance.py similarity index 100% rename from addons/resource/tests/test_performance.py rename to addons/test_resource/tests/test_performance.py diff --git a/addons/resource/tests/test_resource.py b/addons/test_resource/tests/test_resource.py similarity index 99% rename from addons/resource/tests/test_resource.py rename to addons/test_resource/tests/test_resource.py index 25ae1b80ee8..ead33db87ea 100644 --- a/addons/resource/tests/test_resource.py +++ b/addons/test_resource/tests/test_resource.py @@ -7,7 +7,7 @@ from pytz import timezone, utc from odoo import fields from odoo.exceptions import ValidationError from odoo.addons.resource.models.resource import Intervals, sum_intervals -from odoo.addons.resource.tests.common import TestResourceCommon +from odoo.addons.test_resource.tests.common import TestResourceCommon from odoo.tests.common import TransactionCase