[oe-commits] Yi Zhao : lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 8197c5b63903cb69fde946874aea0e4adaa098e6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8197c5b63903cb69fde946874aea0e4adaa098e6

Author: Yi Zhao <yi.zhao at windriver.com>
Date:   Thu Apr  9 15:10:57 2015 +0800

lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer

Use absolute path instead of relative path for meta-skeleton.
Otherwise the case would fail if the builddir outside the poky source
tree.

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oeqa/selftest/bblayers.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index 5b046d0..3a18029 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -6,7 +6,7 @@ import shutil
 
 import oeqa.utils.ftools as ftools
 from oeqa.selftest.base import oeSelfTest
-from oeqa.utils.commands import runCmd
+from oeqa.utils.commands import runCmd, get_bb_var
 from oeqa.utils.decorators import testcase
 
 class BitbakeLayers(oeSelfTest):
@@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest):
         self.assertTrue(find_in_contents)
 
     def test_bitbakelayers_add_remove(self):
+        test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
         result = runCmd('bitbake-layers show-layers')
         self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf')
-        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers add-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
         self.assertIn('meta-skeleton', result.output)
-        result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers remove-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
         self.assertNotIn('meta-skeleton', result.output)
-        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+        result = runCmd('bitbake-layers add-layer %s' % test_layer)
         result = runCmd('bitbake-layers show-layers')
         self.assertIn('meta-skeleton', result.output)
         result = runCmd('bitbake-layers remove-layer */meta-skeleton')