summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-06-06 07:15:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-07 15:22:38 +0100
commitd9b3ee8b38f877c1723e48f1aa311c28102786fb (patch)
tree5ba5ad84fbda7d3de15c10ff73105ea9f8565826 /meta/lib
parent84441a96f0d369634c4a777ba3bc135a9893fc95 (diff)
downloadopenembedded-core-contrib-d9b3ee8b38f877c1723e48f1aa311c28102786fb.tar.gz
openembedded-core-contrib-d9b3ee8b38f877c1723e48f1aa311c28102786fb.tar.bz2
openembedded-core-contrib-d9b3ee8b38f877c1723e48f1aa311c28102786fb.zip
lib/oeqa/otest.py: Fix import tests from other layers with python3
In python3 the functionality to import modules has been changed and this broke the capability to add runtime tests from other layers. This commit returns this capability to testimage and testexport. [YOCTO #9705] (From OE-Core rev: a26f23d3ce8f7e9f59dbc9bf27516377fd7a0a6d) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/__init__.py0
-rw-r--r--meta/lib/oeqa/oetest.py5
-rw-r--r--meta/lib/oeqa/runtime/__init__.py3
3 files changed, 2 insertions, 6 deletions
diff --git a/meta/lib/oeqa/__init__.py b/meta/lib/oeqa/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/meta/lib/oeqa/__init__.py
+++ /dev/null
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index b4cf34b720..819f95987b 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -203,8 +203,7 @@ class TestContext(object):
self.testslist = self._get_tests_list(path, extrapath)
self.testsrequired = self._get_test_suites_required()
- self.filesdir = os.path.join(os.path.dirname(os.path.abspath(
- oeqa.runtime.__file__)), "files")
+ self.filesdir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "runtime/files")
self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split()
self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split()
@@ -460,7 +459,7 @@ class RuntimeTestContext(TestContext):
Returns the path of the JSON file for a module, empty if doesn't exitst.
"""
- module_file = module.filename
+ module_file = module.path
json_file = "%s.json" % module_file.rsplit(".", 1)[0]
if os.path.isfile(module_file) and os.path.isfile(json_file):
return json_file
diff --git a/meta/lib/oeqa/runtime/__init__.py b/meta/lib/oeqa/runtime/__init__.py
deleted file mode 100644
index 4cf3fa76b6..0000000000
--- a/meta/lib/oeqa/runtime/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Enable other layers to have tests in the same named directory
-from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)