odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] unwrap tests suites during module loading, prepare for storing/filtering attributes 

bzr revid: xmo@openerp.com-20140217155830-dcacx7qvyf7i0i4m
This commit is contained in:
Xavier Morel 2014-02-17 16:58:30 +01:00
parent 0834a5ba49
commit 9a22d42b8b
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openerp/modules/module.py
View File

@ -20,15 +20,13 @@
# #
############################################################################## ##############################################################################
import base64
import imp import imp
import itertools import itertools
import logging import logging
import os import os
import re import re
import sys import sys
import types import unittest
from cStringIO import StringIO
from os.path import join as opj from os.path import join as opj
import unittest2 import unittest2
@ -365,8 +363,8 @@ def run_unit_tests(module_name, dbname):
mods = get_test_modules(module_name) mods = get_test_modules(module_name)
r = True r = True
for m in mods: for m in mods:
suite = unittest2.TestSuite() tests = unwrap_suite(unittest2.TestLoader().loadTestsFromModule(m))
suite.addTests(unittest2.TestLoader().loadTestsFromModule(m)) suite = unittest2.TestSuite(tests)
_logger.info('module %s: running test %s.', module_name, m.__name__) _logger.info('module %s: running test %s.', module_name, m.__name__)
result = unittest2.TextTestRunner(verbosity=2, stream=TestStream()).run(suite) result = unittest2.TextTestRunner(verbosity=2, stream=TestStream()).run(suite)
@ -376,4 +374,19 @@ def run_unit_tests(module_name, dbname):
current_test = None current_test = None
return r return r
def unwrap_suite(test):
if isinstance(test, unittest.TestCase):
yield test
return
subtests = list(test)
# custom test suite (no test cases)
if not len(subtests):
yield test
return
for item in itertools.chain.from_iterable(
itertools.imap(unwrap_suite, subtests)):
yield item
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: