aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2017-05-23 15:04:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:47:40 +0100
commit971b749f11fa4e8b055ad60eeec1add82287bc53 (patch)
treeaf9a7b2061fc1a0f4ee54510bbfb17b0817b8895
parent2fd0757ae7fd63bc93a4ce8579c6ba0cdbb4c1cd (diff)
downloadopenembedded-core-971b749f11fa4e8b055ad60eeec1add82287bc53.zip
openembedded-core-971b749f11fa4e8b055ad60eeec1add82287bc53.tar.gz
openembedded-core-971b749f11fa4e8b055ad60eeec1add82287bc53.tar.bz2
scripts/oe-test: Move load_test_components to oeqa.utils
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). Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
-rw-r--r--meta/lib/oeqa/core/context.py1
-rw-r--r--meta/lib/oeqa/utils/__init__.py37
-rwxr-xr-xscripts/oe-test31
3 files changed, 39 insertions, 30 deletions
diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py
index 5f399fd..0dbf5c3 100644
--- a/meta/lib/oeqa/core/context.py
+++ b/meta/lib/oeqa/core/context.py
@@ -65,6 +65,7 @@ class OETestContext(object):
class OETestContextExecutor(object):
_context_class = OETestContext
+ _script_executor = 'oe-test'
name = 'core'
help = 'core test component example'
diff --git a/meta/lib/oeqa/utils/__init__.py b/meta/lib/oeqa/utils/__init__.py
index 485de03..d38a323 100644
--- a/meta/lib/oeqa/utils/__init__.py
+++ b/meta/lib/oeqa/utils/__init__.py
@@ -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
diff --git a/scripts/oe-test b/scripts/oe-test
index f90d85b..0a36b78 100755
--- a/scripts/oe-test
+++ b/scripts/oe-test
@@ -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')