summaryrefslogtreecommitdiff
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2017-03-27 13:05:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-28 08:41:07 +0100
commit2c6eac774768aa610a8b3784483b9e90fb629c2d (patch)
treee784b10330274390d38987014db6d6805ec25b12 /meta/lib/oeqa
parent9c948d3de08f158387e08a17cdc0cedc7d26bb54 (diff)
downloadopenembedded-core-2c6eac774768aa610a8b3784483b9e90fb629c2d.tar.gz
openembedded-core-2c6eac774768aa610a8b3784483b9e90fb629c2d.tar.bz2
openembedded-core-2c6eac774768aa610a8b3784483b9e90fb629c2d.zip
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] Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/core/loader.py34
1 files changed, 30 insertions, 4 deletions
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 74f1117825..63a1703536 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -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: