diff --git a/database_cleanup/models/purge_modules.py b/database_cleanup/models/purge_modules.py index 71f7eed825b..696c4a825c0 100644 --- a/database_cleanup/models/purge_modules.py +++ b/database_cleanup/models/purge_modules.py @@ -89,8 +89,6 @@ def find(self): continue res.append((0, 0, {'name': module.name})) - purge_lines.purge() - if not res: raise UserError(_('No modules found to purge')) return res diff --git a/database_cleanup/tests/test_database_cleanup.py b/database_cleanup/tests/test_database_cleanup.py index ca59619b82e..5ce46971e8d 100644 --- a/database_cleanup/tests/test_database_cleanup.py +++ b/database_cleanup/tests/test_database_cleanup.py @@ -132,15 +132,26 @@ def keep_registry(): with keep_registry(), mute_logger("odoo.modules.graph", "odoo.modules.loading"): purge_modules = self.env["cleanup.purge.wizard.module"].create({}) - # this module should be purged already during default_get - self.assertFalse(self.env["ir.module.module"].search( + # no modules are purged during default_get + self.assertTrue(self.env["ir.module.module"].search( [("name", "=", "database_cleanup_test_uninstalled")])) + self.assertTrue(self.env["ir.module.module"].search( + [("name", "=", "database_cleanup_test_to_upgrade")])) with keep_registry(), mute_logger("odoo.modules.graph", "odoo.modules.loading"): purge_modules.purge_all() - # must be removed by the wizard - self.assertFalse(self.env["ir.module.module"].search( - [("name", "=", "database_cleanup_test_to_upgrade")])) + # to_upgrade modules must be removed by the wizard + self.assertFalse( + self.env["ir.module.module"].search( + [("name", "=", "database_cleanup_test_to_upgrade")] + ) + ) + # uninstalled modules must be removed by the wizard + self.assertFalse( + self.env["ir.module.module"].search( + [("name", "=", "database_cleanup_test_uninstalled")] + ) + ) def tearDown(self): super(TestDatabaseCleanup, self).tearDown()