From d6b78ae711b93b4059690320cb8d821aaadd1684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
Date: Tue, 23 May 2017 15:04:57 -0500
Subject: scripts/oe-test: Move load_test_components to oeqa.utils
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
scripts/oe-test | 31 ++-----------------------------
1 file changed, 2 insertions(+), 29 deletions(-)
(limited to 'scripts')
diff --git a/scripts/oe-test b/scripts/oe-test
index f90d85b3da..0a36b78ff7 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')
--
cgit v1.2.3