MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/oe-test: Move load_test_components to oeqa.utils

Browse Source 
In order to maintain compatibility with oe-selftest, the
load_test_components needs to be re-used, so the script
executor needs to pass to only load components supported
by certain script (oe-test, oe-selftest).

(From OE-Core rev: d6b78ae711b93b4059690320cb8d821aaadd1684)

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-05-23 15:04:57 -05:00 committed by Richard Purdie
parent 02417b1496
commit 7c8f3c3980
3 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/lib/oeqa/core/context.py
View File

@ -65,6 +65,7 @@ class OETestContext(object):
class OETestContextExecutor(object):
_context_class = OETestContext
_script_executor = 'oe-test'
name = 'core'
help = 'core test component example'

37
meta/lib/oeqa/utils/__init__.py
View File

@ -2,7 +2,6 @@
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
# Borrowed from CalledProcessError
class CommandError(Exception):
@ -66,3 +65,39 @@ def make_logger_bitbake_compatible(logger):
logger.info = _bitbake_log_info
return logger
def load_test_components(logger, executor):
import sys
import os
import importlib
from oeqa.core.context import OETestContextExecutor
components = {}
for path in sys.path:
base_dir = os.path.join(path, 'oeqa')
if os.path.exists(base_dir) and os.path.isdir(base_dir):
for file in os.listdir(base_dir):
comp_name = file
comp_context = os.path.join(base_dir, file, 'context.py')
if os.path.exists(comp_context):
comp_plugin = importlib.import_module('oeqa.%s.%s' % \
(comp_name, 'context'))
try:
if not issubclass(comp_plugin._executor_class,
OETestContextExecutor):
raise TypeError("Component %s in %s, _executor_class "\
"isn't derived from OETestContextExecutor."\
% (comp_name, comp_context))
if comp_plugin._executor_class._script_executor \
!= executor:
continue
components[comp_name] = comp_plugin._executor_class()
except AttributeError:
raise AttributeError("Component %s in %s don't have "\
"_executor_class defined." % (comp_name, comp_context))
return components

31
scripts/oe-test
View File

@ -8,7 +8,6 @@
import os
import sys
import argparse
import importlib
import logging
scripts_path = os.path.dirname(os.path.realpath(__file__))
@ -25,37 +24,11 @@ try:
except ImportError:
pass
from oeqa.core.context import OETestContextExecutor
from oeqa.utils import load_test_components
from oeqa.core.exception import OEQAPreRun
logger = scriptutils.logger_create('oe-test')
def _load_test_components(logger):
components = {}
for path in sys.path:
base_dir = os.path.join(path, 'oeqa')
if os.path.exists(base_dir) and os.path.isdir(base_dir):
for file in os.listdir(base_dir):
comp_name = file
comp_context = os.path.join(base_dir, file, 'context.py')
if os.path.exists(comp_context):
comp_plugin = importlib.import_module('oeqa.%s.%s' % \
(comp_name, 'context'))
try:
if not issubclass(comp_plugin._executor_class,
OETestContextExecutor):
raise TypeError("Component %s in %s, _executor_class "\
"isn't derived from OETestContextExecutor."\
% (comp_name, comp_context))
components[comp_name] = comp_plugin._executor_class()
except AttributeError:
raise AttributeError("Component %s in %s don't have "\
"_executor_class defined." % (comp_name, comp_context))
return components
def main():
parser = argparse_oe.ArgumentParser(description="OpenEmbedded test tool",
add_help=False,
@ -74,7 +47,7 @@ def main():
elif global_args.quiet:
logger.setLevel(logging.ERROR)
components = _load_test_components(logger)
components = load_test_components(logger, 'oe-test')
subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>')
subparsers.add_subparser_group('components', 'Test components')