sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

oeqa/core/loader.py: Do not import underscore modules by default 

Underscore modules are meant to be run only when manually added to the test
suite, so far another mechanisms are in place to make this happen with
runtime, sdk, and esdk (mostly in test* bbclasses).

This will add such functionality in the core framework so other specific
frameworks can take use this without adding something else.

[YOCTO #10980]

(From OE-Core rev: 2c6eac774768aa610a8b3784483b9e90fb629c2d)

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mariano Lopez 2017-03-27 13:05:24 -07:00 committed by Richard Purdie
parent 71e48a3617
commit c711caae83
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta/lib/oeqa/core/loader.py
View File

@ -223,8 +223,21 @@ class OETestLoader(unittest.TestLoader):
msg = 'Tried to import %s test module but is a built-in'
raise ImportError(msg % module.__name__)
if not self.modules or "all" in self.modules or \
module.__name__ in self.modules:
# Normal test modules are loaded if no modules were specified,
# if module is in the specified module list or if 'all' is in
# module list.
# Underscore modules are loaded only if specified in module list.
load_module = True if not module.__name__.startswith('_') \
and (not self.modules \
or module.__name__ in self.modules \
or 'all' in self.modules) \
else False
load_underscore = True if module.__name__.startswith('_') \
and module.__name__ in self.modules \
else False
if load_module or load_underscore:
return super(OETestLoader, self).loadTestsFromModule(
module, *args, pattern=pattern, **kws)
else:
@ -238,8 +251,21 @@ class OETestLoader(unittest.TestLoader):
msg = 'Tried to import %s test module but is a built-in'
raise ImportError(msg % module.__name__)
if not self.modules or "all" in self.modules or \
module.__name__ in self.modules:
# Normal test modules are loaded if no modules were specified,
# if module is in the specified module list or if 'all' is in
# module list.
# Underscore modules are loaded only if specified in module list.
load_module = True if not module.__name__.startswith('_') \
and (not self.modules \
or module.__name__ in self.modules \
or 'all' in self.modules) \
else False
load_underscore = True if module.__name__.startswith('_') \
and module.__name__ in self.modules \
else False
if load_module or load_underscore:
return super(OETestLoader, self).loadTestsFromModule(
module, use_load_tests)
else: