changeset 2fcc6588d037 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=2fcc6588d037
description:
        Add extras modules to ModuleTestCase

        issue7935
        review50661002
diffstat:

 CHANGELOG                    |   1 +
 trytond/tests/test_tryton.py |  29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diffs (71 lines):

diff -r 677c4fc1c843 -r 2fcc6588d037 CHANGELOG
--- a/CHANGELOG Thu Jan 17 17:13:26 2019 +0100
+++ b/CHANGELOG Thu Jan 17 17:22:22 2019 +0100
@@ -1,3 +1,4 @@
+* Add extras modules to ModuleTestCase
 * Add timeout to Report.convert
 * Allow records from XML with noupdate to be deleted
 * Add ir.calendar for month and day
diff -r 677c4fc1c843 -r 2fcc6588d037 trytond/tests/test_tryton.py
--- a/trytond/tests/test_tryton.py      Thu Jan 17 17:13:26 2019 +0100
+++ b/trytond/tests/test_tryton.py      Thu Jan 17 17:22:22 2019 +0100
@@ -44,10 +44,13 @@
 Pool.test = True
 
 
-def activate_module(name):
+def activate_module(modules):
+    '''
+    Activate modules for the tested database
     '''
-    Activate module for the tested database
-    '''
+    if isinstance(modules, str):
+        modules = [modules]
+    name = '-'.join(modules)
     if not db_exist(DB_NAME) and restore_db_cache(name):
         return
     create_db()
@@ -55,18 +58,18 @@
         pool = Pool()
         Module = pool.get('ir.module')
 
-        modules = Module.search([
-                ('name', '=', name),
+        records = Module.search([
+                ('name', 'in', modules),
                 ])
-        assert modules, "%s not found" % name
+        assert len(records) == len(modules)
 
-        modules = Module.search([
-                ('name', '=', name),
+        records = Module.search([
+                ('name', 'in', modules),
                 ('state', '!=', 'activated'),
                 ])
 
-        if modules:
-            Module.activate(modules)
+        if records:
+            Module.activate(records)
             transaction.commit()
 
             ActivateUpgrade = pool.get('ir.module.activate_upgrade',
@@ -210,11 +213,15 @@
 class ModuleTestCase(unittest.TestCase):
     'Trytond Test Case'
     module = None
+    extras = None
 
     @classmethod
     def setUpClass(cls):
         drop_db()
-        activate_module(cls.module)
+        modules = [cls.module]
+        if cls.extras:
+            modules.extend(cls.extras)
+        activate_module(modules)
         super(ModuleTestCase, cls).setUpClass()
 
     @classmethod

Reply via email to