* [PATCH 1/3] oeqa: Remove __init__.py files.
2017-03-24 22:06 [PATCH 0/3] oeqa/runtime: Import custom targets mariano.lopez
@ 2017-03-24 22:06 ` mariano.lopez
2017-03-24 22:06 ` [PATCH 2/3] oeqa/target: Add decorator to register targets mariano.lopez
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: mariano.lopez @ 2017-03-24 22:06 UTC (permalink / raw)
To: openembedded-core, juro.bystricky
From: Mariano Lopez <mariano.lopez@linux.intel.com>
From python 3.3 and above, if a module path contains an __init__.py file, just
that path will be checked for module imports; this behavior makes impossible
to extend core functionality using other layers with the current __init__.py
files. You can check a more detailed explanation on:
http://python-notes.curiousefficiency.org/en/latest/python_concepts/import_traps.html
This patch removes the __init__.py files from just from the new framework.
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/core/__init__.py | 0
meta/lib/oeqa/core/cases/__init__.py | 0
meta/lib/oeqa/core/decorator/{__init__.py => base.py} | 0
meta/lib/oeqa/core/decorator/data.py | 3 +--
meta/lib/oeqa/core/decorator/depends.py | 4 +---
meta/lib/oeqa/core/decorator/oeid.py | 2 +-
meta/lib/oeqa/core/decorator/oetag.py | 2 +-
meta/lib/oeqa/core/decorator/oetimeout.py | 2 +-
meta/lib/oeqa/core/loader.py | 2 +-
meta/lib/oeqa/core/target/{__init__.py => base.py} | 0
meta/lib/oeqa/core/target/qemu.py | 2 +-
meta/lib/oeqa/core/target/ssh.py | 2 +-
meta/lib/oeqa/core/tests/__init__.py | 0
meta/lib/oeqa/core/utils/__init__.py | 0
meta/lib/oeqa/runtime/decorator/package.py | 2 +-
meta/lib/oeqa/runtime/utils/__init__.py | 0
meta/lib/oeqa/sdk/__init__.py | 0
meta/lib/oeqa/sdk/utils/__init__.py | 0
meta/lib/oeqa/sdkext/__init__.py | 0
19 files changed, 9 insertions(+), 12 deletions(-)
delete mode 100644 meta/lib/oeqa/core/__init__.py
delete mode 100644 meta/lib/oeqa/core/cases/__init__.py
rename meta/lib/oeqa/core/decorator/{__init__.py => base.py} (100%)
rename meta/lib/oeqa/core/target/{__init__.py => base.py} (100%)
delete mode 100644 meta/lib/oeqa/core/tests/__init__.py
delete mode 100644 meta/lib/oeqa/core/utils/__init__.py
delete mode 100644 meta/lib/oeqa/runtime/utils/__init__.py
delete mode 100644 meta/lib/oeqa/sdk/__init__.py
delete mode 100644 meta/lib/oeqa/sdk/utils/__init__.py
delete mode 100644 meta/lib/oeqa/sdkext/__init__.py
diff --git a/meta/lib/oeqa/core/__init__.py b/meta/lib/oeqa/core/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/core/cases/__init__.py b/meta/lib/oeqa/core/cases/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/core/decorator/__init__.py b/meta/lib/oeqa/core/decorator/base.py
similarity index 100%
rename from meta/lib/oeqa/core/decorator/__init__.py
rename to meta/lib/oeqa/core/decorator/base.py
diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index ff7bdd9..658e8a2 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -2,8 +2,7 @@
# Released under the MIT license (see COPYING.MIT)
from oeqa.core.exception import OEQAMissingVariable
-
-from . import OETestDecorator, registerDecorator
+from oeqa.core.decorator.base import OETestDecorator, registerDecorator
def has_feature(td, feature):
"""
diff --git a/meta/lib/oeqa/core/decorator/depends.py b/meta/lib/oeqa/core/decorator/depends.py
index 195711c..608b06a 100644
--- a/meta/lib/oeqa/core/decorator/depends.py
+++ b/meta/lib/oeqa/core/decorator/depends.py
@@ -2,10 +2,8 @@
# Released under the MIT license (see COPYING.MIT)
from unittest import SkipTest
-
from oeqa.core.exception import OEQADependency
-
-from . import OETestDiscover, registerDecorator
+from oeqa.core.decorator.base import OETestDiscover, registerDecorator
def _add_depends(registry, case, depends):
module_name = case.__module__
diff --git a/meta/lib/oeqa/core/decorator/oeid.py b/meta/lib/oeqa/core/decorator/oeid.py
index ea8017a..a5bee52 100644
--- a/meta/lib/oeqa/core/decorator/oeid.py
+++ b/meta/lib/oeqa/core/decorator/oeid.py
@@ -1,8 +1,8 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
-from . import OETestFilter, registerDecorator
from oeqa.core.utils.misc import intToList
+from oeqa.core.decorator.base import OETestFilter, registerDecorator
def _idFilter(oeid, filters):
return False if oeid in filters else True
diff --git a/meta/lib/oeqa/core/decorator/oetag.py b/meta/lib/oeqa/core/decorator/oetag.py
index ad38ab7..6a36428 100644
--- a/meta/lib/oeqa/core/decorator/oetag.py
+++ b/meta/lib/oeqa/core/decorator/oetag.py
@@ -1,8 +1,8 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
-from . import OETestFilter, registerDecorator
from oeqa.core.utils.misc import strToList
+from oeqa.core.decorator.base import OETestFilter, registerDecorator
def _tagFilter(tags, filters):
return False if set(tags) & set(filters) else True
diff --git a/meta/lib/oeqa/core/decorator/oetimeout.py b/meta/lib/oeqa/core/decorator/oetimeout.py
index a247583..749e8a1 100644
--- a/meta/lib/oeqa/core/decorator/oetimeout.py
+++ b/meta/lib/oeqa/core/decorator/oetimeout.py
@@ -2,8 +2,8 @@
# Released under the MIT license (see COPYING.MIT)
import signal
-from . import OETestDecorator, registerDecorator
from oeqa.core.exception import OEQATimeoutError
+from oeqa.core.decorator.base import OETestDecorator, registerDecorator
@registerDecorator
class OETimeout(OETestDecorator):
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 74f1117..2e7d0d0 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -9,7 +9,7 @@ from oeqa.core.utils.path import findFile
from oeqa.core.utils.test import getSuiteModules, getCaseID
from oeqa.core.case import OETestCase
-from oeqa.core.decorator import decoratorClasses, OETestDecorator, \
+from oeqa.core.decorator.base import decoratorClasses, OETestDecorator, \
OETestFilter, OETestDiscover
def _make_failed_test(classname, methodname, exception, suiteClass):
diff --git a/meta/lib/oeqa/core/target/__init__.py b/meta/lib/oeqa/core/target/base.py
similarity index 100%
rename from meta/lib/oeqa/core/target/__init__.py
rename to meta/lib/oeqa/core/target/base.py
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index 2dc521c..261c466 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -6,7 +6,7 @@ import sys
import signal
import time
-from .ssh import OESSHTarget
+from oeqa.core.target.ssh import OESSHTarget
from oeqa.utils.qemurunner import QemuRunner
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic', 'elf']
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index b80939c..035965a 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -7,7 +7,7 @@ import select
import logging
import subprocess
-from . import OETarget
+from oeqa.core.target.base import OETarget
class OESSHTarget(OETarget):
def __init__(self, logger, ip, server_ip, timeout=300, user='root',
diff --git a/meta/lib/oeqa/core/tests/__init__.py b/meta/lib/oeqa/core/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/core/utils/__init__.py b/meta/lib/oeqa/core/utils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py
index aa6ecb6..0d3224f 100644
--- a/meta/lib/oeqa/runtime/decorator/package.py
+++ b/meta/lib/oeqa/runtime/decorator/package.py
@@ -1,8 +1,8 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
-from oeqa.core.decorator import OETestDecorator, registerDecorator
from oeqa.core.utils.misc import strToSet
+from oeqa.core.decorator.base import OETestDecorator, registerDecorator
@registerDecorator
class OEHasPackage(OETestDecorator):
diff --git a/meta/lib/oeqa/runtime/utils/__init__.py b/meta/lib/oeqa/runtime/utils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/sdk/__init__.py b/meta/lib/oeqa/sdk/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/sdk/utils/__init__.py b/meta/lib/oeqa/sdk/utils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/lib/oeqa/sdkext/__init__.py b/meta/lib/oeqa/sdkext/__init__.py
deleted file mode 100644
index e69de29..0000000
--
2.10.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] oeqa/target: Add decorator to register targets
2017-03-24 22:06 [PATCH 0/3] oeqa/runtime: Import custom targets mariano.lopez
2017-03-24 22:06 ` [PATCH 1/3] oeqa: Remove __init__.py files mariano.lopez
@ 2017-03-24 22:06 ` mariano.lopez
2017-03-24 22:06 ` [PATCH 3/3] oeqa/runtime/context.py: Add automatic target loading mariano.lopez
2017-03-27 13:38 ` [PATCH 0/3] oeqa/runtime: Import custom targets Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: mariano.lopez @ 2017-03-24 22:06 UTC (permalink / raw)
To: openembedded-core, juro.bystricky
From: Mariano Lopez <mariano.lopez@linux.intel.com>
This adds a way to register targets that can be used with runtime testing. To
do this just decorate a target class with registerTarget, and set "targetName"
attribute to the name that will be used by TEST_TARGET variable.
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/lib/oeqa/core/target/base.py | 23 +++++++++++++++++++++++
meta/lib/oeqa/core/target/qemu.py | 5 +++++
meta/lib/oeqa/core/target/ssh.py | 6 +++++-
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/core/target/base.py b/meta/lib/oeqa/core/target/base.py
index d2468bc..c886491 100644
--- a/meta/lib/oeqa/core/target/base.py
+++ b/meta/lib/oeqa/core/target/base.py
@@ -1,8 +1,31 @@
# Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT)
+import os
+import sys
+import importlib
from abc import abstractmethod
+# Used to keep record of registered targets, it
+# uses class' targetName as the key to the class.
+targetClasses = {}
+
+def registerTarget(obj):
+ """ Use as decorator to register targets for runtime testing """
+
+ if (obj.targetName in targetClasses and
+ obj.__name__ != targetClasses[obj.targetName].__name__):
+
+ msg = ('Tried to register %s as "%s" that is used by %s' %
+ (obj, obj.targetName, targetClasses[obj.targetName]))
+ raise ImportError(msg)
+
+ if not issubclass(obj, OETarget):
+ raise TypeError('%s must inherit from OETarget' % obj)
+
+ targetClasses[obj.targetName] = obj
+ return obj
+
class OETarget(object):
def __init__(self, logger, *args, **kwargs):
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index 261c466..d1b6bf5 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -6,12 +6,17 @@ import sys
import signal
import time
+from oeqa.core.target.base import registerTarget
from oeqa.core.target.ssh import OESSHTarget
from oeqa.utils.qemurunner import QemuRunner
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic', 'elf']
+@registerTarget
class OEQemuTarget(OESSHTarget):
+
+ targetName = 'qemu'
+
def __init__(self, logger, ip, server_ip, timeout=300, user='root',
port=None, machine='', rootfs='', kernel='', kvm=False,
dump_dir='', dump_host_cmds='', display='', bootlog='',
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 035965a..d973058 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -7,9 +7,13 @@ import select
import logging
import subprocess
-from oeqa.core.target.base import OETarget
+from oeqa.core.target.base import OETarget, registerTarget
+@registerTarget
class OESSHTarget(OETarget):
+
+ targetName = 'simpleremote'
+
def __init__(self, logger, ip, server_ip, timeout=300, user='root',
port=None, **kwargs):
if not logger:
--
2.10.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] oeqa/runtime/context.py: Add automatic target loading
2017-03-24 22:06 [PATCH 0/3] oeqa/runtime: Import custom targets mariano.lopez
2017-03-24 22:06 ` [PATCH 1/3] oeqa: Remove __init__.py files mariano.lopez
2017-03-24 22:06 ` [PATCH 2/3] oeqa/target: Add decorator to register targets mariano.lopez
@ 2017-03-24 22:06 ` mariano.lopez
2017-03-27 13:38 ` [PATCH 0/3] oeqa/runtime: Import custom targets Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: mariano.lopez @ 2017-03-24 22:06 UTC (permalink / raw)
To: openembedded-core, juro.bystricky
From: Mariano Lopez <mariano.lopez@linux.intel.com>
This adds automatic target loading for runtime testing. It will look for
targets in 'lib/oeqa/core/target' in every layer used in the build.
Introspection was used to achieve this functionality, the idea is to load all
target modules and they will be registered with registerTarget decorator, so
it is less error prone than previous implementation.
testimage and testexport bbclasses were modified to support this. testexport
required more work to find the targets and copy them into the exporting
directory. The executor also needed to remove current choices (simpleremote,
qemu) because now we can have custom targets.
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
---
meta/classes/testexport.bbclass | 19 ++++++-
meta/classes/testimage.bbclass | 4 +-
meta/lib/oeqa/core/target/base.py | 26 +++++++++
meta/lib/oeqa/runtime/context.py | 109 ++++++++------------------------------
4 files changed, 68 insertions(+), 90 deletions(-)
diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index 56edda9..25d66ca 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -58,8 +58,8 @@ def testexport_main(d):
logger = logging.getLogger("BitBake")
target = OERuntimeTestContextExecutor.getTarget(
- d.getVar("TEST_TARGET"), None, d.getVar("TEST_TARGET_IP"),
- d.getVar("TEST_SERVER_IP"))
+ d.getVar("TEST_TARGET"), d.getVar('BBLAYERS').split(), None,
+ d.getVar("TEST_TARGET_IP"), d.getVar("TEST_SERVER_IP"))
host_dumper = OERuntimeTestContextExecutor.getHostDumper(
d.getVar("testimage_dump_host"), d.getVar("TESTIMAGE_DUMP_DIR"))
@@ -108,6 +108,21 @@ def copy_needed_files(d, tc):
else:
shutil.copy2(src, dst)
+ # Get all target files.
+ t_path = os.path.join('lib', 'oeqa', 'core', 'target')
+ targets_to_copy = [os.path.join(root, filename)
+ for path in d.getVar('BBLAYERS').split()
+ for root, _, files in os.walk(os.path.join(path, t_path))
+ for filename in files
+ if filename.endswith('.py') ]
+
+ # Copy all targets.
+ export_target_path = os.path.join(export_path, t_path)
+ oe.path.remove(export_target_path)
+ bb.utils.mkdirhier(export_target_path)
+ for f in targets_to_copy:
+ shutil.copy2(f, export_target_path)
+
# Remove cases and just copy the ones specified
cases_path = os.path.join(export_path, 'lib', 'oeqa', 'runtime', 'cases')
oe.path.remove(cases_path)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index bfe5714..3199ac4 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -242,8 +242,8 @@ def testimage_main(d):
# the robot dance
target = OERuntimeTestContextExecutor.getTarget(
- d.getVar("TEST_TARGET"), None, d.getVar("TEST_TARGET_IP"),
- d.getVar("TEST_SERVER_IP"), **target_kwargs)
+ d.getVar("TEST_TARGET"), d.getVar('BBLAYERS').split(), None,
+ d.getVar("TEST_TARGET_IP"), d.getVar("TEST_SERVER_IP"), **target_kwargs)
# test context
tc = OERuntimeTestContext(td, logger, target, host_dumper,
diff --git a/meta/lib/oeqa/core/target/base.py b/meta/lib/oeqa/core/target/base.py
index c886491..426a577 100644
--- a/meta/lib/oeqa/core/target/base.py
+++ b/meta/lib/oeqa/core/target/base.py
@@ -54,3 +54,29 @@ class OETarget(object):
@abstractmethod
def copyDirTo(self, localSrc, remoteDst):
pass
+
+def discover_targets(layer_paths):
+ """
+ Imports modules found in 'lib/oeqa/core/target'.
+
+ This is used to register targets using registerTarget decorator.
+ """
+
+ target_path = 'lib/oeqa/core/target'
+ paths = [os.path.join(p, target_path) for p in layer_paths]
+ for path in paths:
+ files_python = [os.path.join(root, filename)
+ for root, _, filenames in os.walk(path)
+ for filename in filenames
+ if filename.endswith('.py')]
+ for f in files_python:
+ if '__init__.py' in f:
+ continue
+ abs_path = os.path.abspath(f)
+ for sys_path in sys.path:
+ if sys_path in abs_path:
+ rel_path = os.path.relpath(abs_path, sys_path)
+ break
+
+ name = rel_path.replace('.py', '').replace(os.path.sep, '.')
+ importlib.import_module(name)
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py
index c4cd76c..5482a39 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -51,6 +51,10 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
default_target_ip = '192.168.7.2'
default_host_dumper_dir = '/tmp/oe-saved-tests'
default_extract_dir = 'packages/extracted'
+ default_root = os.path.join(
+ os.path.dirname(
+ os.path.dirname(
+ os.path.dirname(os.path.dirname(__file__)))))
def register_commands(self, logger, subparsers):
super(OERuntimeTestContextExecutor, self).register_commands(logger, subparsers)
@@ -58,7 +62,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
runtime_group = self.parser.add_argument_group('runtime options')
runtime_group.add_argument('--target-type', action='store',
- default=self.default_target_type, choices=['simpleremote', 'qemu'],
+ default=self.default_target_type,
help="Target type of device under test, default: %s" \
% self.default_target_type)
runtime_group.add_argument('--target-ip', action='store',
@@ -89,96 +93,28 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
help="Qemu boot configuration, only needed when target_type is QEMU.")
@staticmethod
- def getTarget(target_type, logger, target_ip, server_ip, **kwargs):
+ def getTarget(target_type, target_paths, logger, target_ip, server_ip, **kwargs):
+ """
+ Gets target to be used with runtime testing.
+
+ It is possible to add targes using registerTarget decorator and putting
+ the module in 'lib/oeqa/core/target' directory of your layer.
+ """
+
+ from oeqa.core.target.base import discover_targets, targetClasses
+
target = None
+ discover_targets(target_paths)
- if target_type == 'simpleremote':
- target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
- elif target_type == 'qemu':
- target = OEQemuTarget(logger, target_ip, server_ip, **kwargs)
+ target_class = targetClasses.get(target_type, None)
+ if target_class:
+ target = target_class(logger, target_ip, server_ip, **kwargs)
else:
- # XXX: This code uses the old naming convention for controllers and
- # targets, the idea it is to leave just targets as the controller
- # most of the time was just a wrapper.
- # XXX: This code tries to import modules from lib/oeqa/controllers
- # directory and treat them as controllers, it will less error prone
- # to use introspection to load such modules.
- # XXX: Don't base your targets on this code it will be refactored
- # in the near future.
- # Custom target module loading
- try:
- target_modules_path = kwargs.get('target_modules_path', '')
- controller = OERuntimeTestContextExecutor.getControllerModule(target_type, target_modules_path)
- target = controller(logger, target_ip, server_ip, **kwargs)
- except ImportError as e:
- raise TypeError("Failed to import %s from available controller modules" % target_type)
+ msg = 'Can\'t find "%s" in available targets' % target_type
+ raise TypeError(msg)
return target
- # Search oeqa.controllers module directory for and return a controller
- # corresponding to the given target name.
- # AttributeError raised if not found.
- # ImportError raised if a provided module can not be imported.
- @staticmethod
- def getControllerModule(target, target_modules_path):
- controllerslist = OERuntimeTestContextExecutor._getControllerModulenames(target_modules_path)
- controller = OERuntimeTestContextExecutor._loadControllerFromName(target, controllerslist)
- return controller
-
- # Return a list of all python modules in lib/oeqa/controllers for each
- # layer in bbpath
- @staticmethod
- def _getControllerModulenames(target_modules_path):
-
- controllerslist = []
-
- def add_controller_list(path):
- if not os.path.exists(os.path.join(path, '__init__.py')):
- raise OSError('Controllers directory %s exists but is missing __init__.py' % path)
- files = sorted([f for f in os.listdir(path) if f.endswith('.py') and not f.startswith('_')])
- for f in files:
- module = 'oeqa.controllers.' + f[:-3]
- if module not in controllerslist:
- controllerslist.append(module)
- else:
- raise RuntimeError("Duplicate controller module found for %s. Layers should create unique controller module names" % module)
-
- extpath = target_modules_path.split(':')
- for p in extpath:
- controllerpath = os.path.join(p, 'lib', 'oeqa', 'controllers')
- if os.path.exists(controllerpath):
- add_controller_list(controllerpath)
- return controllerslist
-
- # Search for and return a controller from given target name and
- # set of module names.
- # Raise AttributeError if not found.
- # Raise ImportError if a provided module can not be imported
- @staticmethod
- def _loadControllerFromName(target, modulenames):
- for name in modulenames:
- obj = OERuntimeTestContextExecutor._loadControllerFromModule(target, name)
- if obj:
- return obj
- raise AttributeError("Unable to load {0} from available modules: {1}".format(target, str(modulenames)))
-
- # Search for and return a controller or None from given module name
- @staticmethod
- def _loadControllerFromModule(target, modulename):
- obj = None
- # import module, allowing it to raise import exception
- try:
- module = __import__(modulename, globals(), locals(), [target])
- except Exception as e:
- return obj
- # look for target class in the module, catching any exceptions as it
- # is valid that a module may not have the target class.
- try:
- obj = getattr(module, target)
- except:
- obj = None
- return obj
-
@staticmethod
def readPackagesManifest(manifest):
if not manifest or not os.path.exists(manifest):
@@ -208,7 +144,8 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
self.tc_kwargs['init']['target'] = \
OERuntimeTestContextExecutor.getTarget(args.target_type,
- None, args.target_ip, args.server_ip, **target_kwargs)
+ [self.default_root], None, args.target_ip, args.server_ip,
+ **target_kwargs)
self.tc_kwargs['init']['host_dumper'] = \
OERuntimeTestContextExecutor.getHostDumper(None,
args.host_dumper_dir)
--
2.10.2
^ permalink raw reply related [flat|nested] 6+ messages in thread