From 563dd50339a08dc4aaebd4363b5392237c359e5c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 10 Aug 2016 14:03:15 +0200 Subject: [PATCH 1/3] Revert "split database_cleanup tests in travis config" This reverts commit 61718400f9186d27aa2a4678a4da818bc9a6eacb. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76d4af9f8f9..58cae0d7a9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,9 @@ env: matrix: - LINT_CHECK="1" - TRANSIFEX="1" - - TESTS="1" ODOO_REPO="odoo/odoo" EXCLUDE=database_cleanup - - TESTS="1" ODOO_REPO="OCA/OCB" EXCLUDE=database_cleanup - - TESTS="1" ODOO_REPO="odoo/odoo" INCLUDE=database_cleanup - - TESTS="1" ODOO_REPO="OCA/OCB" INCLUDE=database_cleanup + - TESTS="1" ODOO_REPO="odoo/odoo" + - TESTS="1" ODOO_REPO="OCA/OCB" + - UNIT_TEST="1" virtualenv: system_site_packages: true From 8db8b5d6e0bb128b9a90eb948030ba7372a25150 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 10 Aug 2016 13:34:10 +0200 Subject: [PATCH 2/3] [FIX] database_cleanup reloads the registry which has weird side effects during testing. Take care database_cleanup's tests don't mess up the following tests --- database_cleanup/tests/test_database_cleanup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/database_cleanup/tests/test_database_cleanup.py b/database_cleanup/tests/test_database_cleanup.py index f04609f1c17..060c9174e96 100644 --- a/database_cleanup/tests/test_database_cleanup.py +++ b/database_cleanup/tests/test_database_cleanup.py @@ -2,6 +2,7 @@ # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from psycopg2 import ProgrammingError +from openerp.modules.registry import RegistryManager from openerp.tools import config from openerp.tests.common import TransactionCase @@ -57,6 +58,9 @@ def test_database_cleanup(self): }) purge_modules = self.env['cleanup.purge.wizard.module'].create({}) # 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 + original_registry = RegistryManager.registries[self.env.cr.dbname] config.options['test_enable'] = False purge_modules.purge_all() config.options['test_enable'] = True @@ -64,6 +68,8 @@ def test_database_cleanup(self): self.assertFalse(self.env['ir.module.module'].search([ ('name', '=', 'database_cleanup_test'), ])) + # reset afterwards + RegistryManager.registries[self.env.cr.dbname] = original_registry # create an orphaned table self.env.cr.execute('create table database_cleanup_test (test int)') From ed0db1491ac925bc91f3891b223d78587765f60d Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Wed, 10 Aug 2016 14:05:28 +0200 Subject: [PATCH 3/3] [DEL] unused environment variable --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58cae0d7a9c..9cb88cde5bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ env: - TRANSIFEX="1" - TESTS="1" ODOO_REPO="odoo/odoo" - TESTS="1" ODOO_REPO="OCA/OCB" - - UNIT_TEST="1" virtualenv: system_site_packages: true