[oe-commits] [openembedded-core] 36/37: oeqa/selftest/case: Don't figure out the testlayer inside
git at git.openembedded.org
git at git.openembedded.org
Fri May 26 21:00:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 887149b9a82f83d72d862475472bca5d352e27bc
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: Fri May 26 15:37:59 2017 -0500
oeqa/selftest/case: Don't figure out the testlayer inside
The test layer is added at init of selftest and is the same
across test runs so pass it as a attr in the context.
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/selftest/case.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py
index 1e6754a..31a11fd 100644
--- a/meta/lib/oeqa/selftest/case.py
+++ b/meta/lib/oeqa/selftest/case.py
@@ -9,7 +9,7 @@ import errno
from unittest.util import safe_repr
import oeqa.utils.ftools as ftools
-from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer
+from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.core.case import OETestCase
class OESelftestTestCase(OETestCase):
@@ -21,7 +21,6 @@ class OESelftestTestCase(OETestCase):
local_bblayers_backup = os.path.join(builddir, "conf/bblayers.bk")
testinc_bblayers_path = os.path.join(builddir, "conf/bblayers.inc")
machineinc_path = os.path.join(builddir, "conf/machine.inc")
- testlayer_path = get_test_layer()
def __init__(self, methodName="runTest"):
self._extra_tear_down_commands = []
@@ -35,6 +34,7 @@ class OESelftestTestCase(OETestCase):
@classmethod
def setUpClass(cls):
super(OESelftestTestCase, cls).setUpClass()
+ cls.testlayer_path = cls.tc.testlayer_path
cls.add_include()
@classmethod
@@ -75,7 +75,7 @@ class OESelftestTestCase(OETestCase):
def remove_inc_files(cls):
try:
os.remove(os.path.join(cls.builddir, "conf/selftest.inc"))
- for root, _, files in os.walk(get_test_layer()):
+ for root, _, files in os.walk(cls.testlayer_path):
for f in files:
if f == 'test_recipe.inc':
os.remove(os.path.join(root, f))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list