From c711caae831959f4722bec4de98f36507efceccd Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Mon, 27 Mar 2017 13:05:24 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/loader.py | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'meta/lib') 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: -- cgit v1.2.3-54-g00ecf