mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/core/loader: Use full and small module name on filtering

Browse Source 
The small module name was added to support run a whole suite that
has more that 3 levels in the test case name, but this broke the
behaviour for use a full test case name.

[YOCTO #11632]

(From OE-Core rev: 9ab20ceb5801bee8dd8b218b3928720da5e1d403)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2017-06-12 16:41:18 -05:00
committed by Richard Purdie
parent 3c5c8ccee1
commit 77a358e41e
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/core/loader.py
+20 -10
View File
@@ -167,21 +167,28 @@ class OETestLoader(unittest.TestLoader):
# XXX; If the module has more than one namespace only use # XXX; If the module has more than one namespace only use
# the first to support run the whole module specifying the # the first to support run the whole module specifying the
# <module_name>.[test_class].[test_name] # <module_name>.[test_class].[test_name]
module_name = case.__module__.split('.')[0] module_name_small = case.__module__.split('.')[0]
module_name = case.__module__
class_name = case.__class__.__name__ class_name = case.__class__.__name__
test_name = case._testMethodName test_name = case._testMethodName
if self.modules: if self.modules:
if not module_name in self.modules: module = None
return True try:
module = self.modules[module_name_small]
if self.modules[module_name]: except KeyError:
if not class_name in self.modules[module_name]: try:
module = self.modules[module_name]
except KeyError:
return True return True
if self.modules[module_name][class_name]: if module:
if test_name not in self.modules[module_name][class_name]: if not class_name in module:
return True
if module[class_name]:
if test_name not in module[class_name]:
return True return True
# Decorator filters # Decorator filters
@@ -291,7 +298,8 @@ class OETestLoader(unittest.TestLoader):
# XXX; If the module has more than one namespace only use # XXX; If the module has more than one namespace only use
# the first to support run the whole module specifying the # the first to support run the whole module specifying the
# <module_name>.[test_class].[test_name] # <module_name>.[test_class].[test_name]
module_name = module.__name__.split('.')[0] module_name_small = module.__name__.split('.')[0]
module_name = module.__name__
# Normal test modules are loaded if no modules were specified, # Normal test modules are loaded if no modules were specified,
# if module is in the specified module list or if 'all' is in # if module is in the specified module list or if 'all' is in
@@ -300,11 +308,13 @@ class OETestLoader(unittest.TestLoader):
load_module = True if not module_name.startswith('_') \ load_module = True if not module_name.startswith('_') \
and (not self.modules \ and (not self.modules \
or module_name in self.modules \ or module_name in self.modules \
or module_name_small in self.modules \
or 'all' in self.modules) \ or 'all' in self.modules) \
else False else False
load_underscore = True if module_name.startswith('_') \ load_underscore = True if module_name.startswith('_') \
and module_name in self.modules \ and (module_name in self.modules or \
module_name_small in self.modules) \
else False else False
return (load_module, load_underscore) return (load_module, load_underscore)