[IMP] database_cleanup: improve tests

database_cleanup/tests/common.py

@@ -1,14 +1,27 @@
 # Copyright 2021 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo.modules.registry import Registry
+from contextlib import contextmanager
-from odoo.tests.common import TransactionCase
+
+import odoo
+from odoo.tests import common
+from odoo.tests.common import BaseCase, tagged
+
+ADMIN_USER_ID = common.ADMIN_USER_ID
 
 
-class Common(TransactionCase):
+@contextmanager
+def environment():
+    """Return an environment with a new cursor for the current database; the
+    cursor is committed and closed after the context block.
+    """
+    registry = odoo.registry(common.get_db_name())
+    with registry.cursor() as cr:
+        yield odoo.api.Environment(cr, ADMIN_USER_ID, {})
+
+
+# Use post_install to get all models loaded more info: odoo/odoo#13458
+@tagged("post_install", "-at_install")
+class Common(BaseCase):
     def setUp(self):
-        super(Common, self).setUp()
+        super().setUp()
-        # this reloads our registry, and we don't want to run tests twice
-        # we also need the original registry for further tests, so save a
-        # reference to it
-        self.original_registry = Registry.registries[self.env.cr.dbname]

database_cleanup/tests/test_create_indexes.py

@@ -3,22 +3,24 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCreateIndexesLine(Common):
     def setUp(self):
-        super(TestCreateIndexesLine, self).setUp()
+        super().setUp()
+        with environment() as env:
             # delete some index and check if our module recreated it
-        self.env.cr.execute("drop index res_partner_name_index")
+            env.cr.execute("drop index res_partner_name_index")
 
     def test_deleted_index(self):
-        wizard = self.env["cleanup.create_indexes.wizard"].create({})
+        with environment() as env:
+            wizard = env["cleanup.create_indexes.wizard"].create({})
             wizard.purge_all()
-        self.env.cr.execute(
+            env.cr.execute(
                 "select indexname from pg_indexes where "
                 "indexname='res_partner_name_index' and tablename='res_partner' "
             )
-        self.assertEqual(self.env.cr.rowcount, 1)
+            self.assertEqual(env.cr.rowcount, 1)

database_cleanup/tests/test_purge_columns.py

@@ -5,31 +5,36 @@ from psycopg2 import ProgrammingError
 from odoo.tests.common import tagged
 from odoo.tools import mute_logger
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineColumn(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineColumn, self).setUp()
+        super().setUp()
+        with environment() as env:
             # create an orphaned column
-        self.env.cr.execute(
+            env.cr.execute(
                 "alter table res_partner add column database_cleanup_test int"
             )
 
     def test_empty_column(self):
+        with environment() as env:
             # We need use a model that is not blocked (Avoid use res.users)
-        partner_model = self.env["ir.model"].search(
+            partner_model = env["ir.model"].search(
                 [("model", "=", "res.partner")], limit=1
             )
-        wizard = self.env["cleanup.purge.wizard.column"].create(
+            wizard = env["cleanup.purge.wizard.column"].create(
                 {
                     "purge_line_ids": [
                         (
                             0,
                             0,
-                        {"model_id": partner_model.id, "name": "database_cleanup_test"},
+                            {
+                                "model_id": partner_model.id,
+                                "name": "database_cleanup_test",
+                            },
                         )
                     ]
                 }
@@ -37,6 +42,6 @@ class TestCleanupPurgeLineColumn(Common):
             wizard.purge_all()
             # must be removed by the wizard
             with self.assertRaises(ProgrammingError):
-            with self.env.registry.cursor() as cr:
+                with env.registry.cursor() as cr:
                     with mute_logger("odoo.sql_db"):
                         cr.execute("select database_cleanup_test from res_partner")

database_cleanup/tests/test_purge_data.py

@@ -3,28 +3,30 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineData(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineData, self).setUp()
+        super().setUp()
+        with environment() as env:
             # create a data entry pointing nowhere
-        self.env.cr.execute("select max(id) + 1 from res_users")
+            env.cr.execute("select max(id) + 1 from res_users")
-        self.env["ir.model.data"].create(
+            env["ir.model.data"].create(
                 {
                     "module": "database_cleanup",
                     "name": "test_no_data_entry",
                     "model": "res.users",
-                "res_id": self.env.cr.fetchone()[0],
+                    "res_id": env.cr.fetchone()[0],
                 }
             )
 
     def test_pointing_nowhere(self):
-        wizard = self.env["cleanup.purge.wizard.data"].create({})
+        with environment() as env:
+            wizard = env["cleanup.purge.wizard.data"].create({})
             wizard.purge_all()
             # must be removed by the wizard
             with self.assertRaises(ValueError):
-            self.env.ref("database_cleanup.test_no_data_entry")
+                env.ref("database_cleanup.test_no_data_entry")

database_cleanup/tests/test_purge_menus.py

@@ -3,19 +3,21 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineMenu(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineMenu, self).setUp()
+        super().setUp()
+        with environment() as env:
             # create a new empty menu
-        self.menu = self.env["ir.ui.menu"].create({"name": "database_cleanup_test"})
+            self.menu = env["ir.ui.menu"].create({"name": "database_cleanup_test"})
 
     def test_empty_menu(self):
-        wizard = self.env["cleanup.purge.wizard.menu"].create(
+        with environment() as env:
+            wizard = env["cleanup.purge.wizard.menu"].create(
                 {
                     "purge_line_ids": [
                         (
@@ -30,7 +32,7 @@ class TestCleanupPurgeLineMenu(Common):
             )
             wizard.purge_all()
             self.assertFalse(
-            self.env["ir.ui.menu"].search(
+                env["ir.ui.menu"].search(
                     [
                         ("name", "=", "database_cleanup_test"),
                     ]

database_cleanup/tests/test_purge_models.py

@@ -3,40 +3,36 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineColumn(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineColumn, self).setUp()
+        super().setUp()
+        with environment() as env:
             # create a nonexistent model
             self.model_name = "x_database.cleanup.test.model"
             self.model_values = {
                 "name": "Database cleanup test model",
                 "model": self.model_name,
             }
-        self.model = self.env["ir.model"].create(self.model_values)
+            self.model = env["ir.model"].create(self.model_values)
-        self.env.cr.execute(
+            env.cr.execute(
                 "insert into ir_attachment (name, res_model, res_id, type) values "
                 "('test attachment', %s, 42, 'binary')",
                 [self.model_name],
             )
-        self.env.registry.models.pop(self.model_name)
+            env.registry.models.pop(self.model_name)
-
-    def tearDown(self):
-        """We recreate the model to avoid registry Exception at loading"""
-        super(TestCleanupPurgeLineColumn, self).tearDown()
-        # FIXME: issue origin is not clear but it must be addressed.
-        self.model = self.env["ir.model"].create(self.model_values)
 
     def test_empty_model(self):
-        wizard = self.env["cleanup.purge.wizard.model"].create({})
+        with environment() as env:
+            wizard = env["cleanup.purge.wizard.model"].create({})
             wizard.purge_all()
             # must be removed by the wizard
             self.assertFalse(
-            self.env["ir.model"].search(
+                env["ir.model"].search(
                     [
                         ("model", "=", self.model_name),
                     ]

database_cleanup/tests/test_purge_modules.py

@@ -3,16 +3,17 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineModule(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineModule, self).setUp()
+        super().setUp()
+        with environment() as env:
             # create a nonexistent module
-        self.module = self.env["ir.module.module"].create(
+            self.module = env["ir.module.module"].create(
                 {
                     "name": "database_cleanup_test",
                     "state": "to upgrade",
@@ -20,8 +21,9 @@ class TestCleanupPurgeLineModule(Common):
             )
 
     def test_remove_to_upgrade_module(self):
-        wizard = self.env["cleanup.purge.wizard.module"].create({})
+        with environment() as env:
-        module_names = wizard.purge_line_ids.filtered(lambda x: not x.purged).mapped(
+            wizard = env["cleanup.purge.wizard.module"].create({})
-            "name"
+            module_names = wizard.purge_line_ids.filtered(
-        )
+                lambda x: not x.purged
+            ).mapped("name")
             self.assertTrue("database_cleanup_test" in module_names)

database_cleanup/tests/test_purge_properties.py

@@ -3,21 +3,23 @@
 
 from odoo.tests.common import tagged
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineProperty(Common):
     def setUp(self):
-        super(TestCleanupPurgeLineProperty, self).setUp()
+        super().setUp()
+        with environment() as env:
             # Create one property for tests
-        self.partner_name_field_id = self.env["ir.model.fields"].search(
+            self.partner_name_field_id = env["ir.model.fields"].search(
                 [("name", "=", "name"), ("model_id.model", "=", "res.partner")], limit=1
             )
 
     def test_property_to_not_removed(self):
-        self.property = self.env["ir.property"].create(
+        with environment() as env:
+            self.property = env["ir.property"].create(
                 {
                     "fields_id": self.partner_name_field_id.id,
                     "type": "char",
@@ -25,12 +27,13 @@ class TestCleanupPurgeLineProperty(Common):
                     "res_id": False,
                 }
             )
-        wizard = self.env["cleanup.purge.wizard.property"].create({})
+            wizard = env["cleanup.purge.wizard.property"].create({})
             wizard.purge_all()
             self.assertTrue(self.property.exists())
 
     def test_property_no_value(self):
-        self.property = self.env["ir.property"].create(
+        with environment() as env:
+            self.property = env["ir.property"].create(
                 {
                     "fields_id": self.partner_name_field_id.id,
                     "type": "char",
@@ -38,6 +41,6 @@ class TestCleanupPurgeLineProperty(Common):
                     "res_id": False,
                 }
             )
-        wizard = self.env["cleanup.purge.wizard.property"].create({})
+            wizard = env["cleanup.purge.wizard.property"].create({})
             wizard.purge_all()
             self.assertFalse(self.property.exists())

database_cleanup/tests/test_purge_tables.py

@@ -5,21 +5,19 @@ from psycopg2 import ProgrammingError
 from odoo.tests.common import tagged
 from odoo.tools import mute_logger
 
-from .common import Common
+from .common import Common, environment
 
 
 # Use post_install to get all models loaded more info: odoo/odoo#13458
 @tagged("post_install", "-at_install")
 class TestCleanupPurgeLineTable(Common):
-    def setUp(self):
-        super(TestCleanupPurgeLineTable, self).setUp()
-        # create an orphaned table
-        self.env.cr.execute("create table database_cleanup_test (test int)")
-
     def test_empty_table(self):
-        wizard = self.env["cleanup.purge.wizard.table"].create({})
+        with environment() as env:
+            # create an orphaned table
+            env.cr.execute("create table database_cleanup_test (test int)")
+            wizard = env["cleanup.purge.wizard.table"].create({})
             wizard.purge_all()
             with self.assertRaises(ProgrammingError):
-            with self.env.registry.cursor() as cr:
+                with env.registry.cursor() as cr:
                     with mute_logger("odoo.sql_db"):
                         cr.execute("select * from database_cleanup_test")