summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-03-16 10:45:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:43 +0000
commit7f536ba0c1593eff8a85d7d915f00c215bc93d49 (patch)
treeb9e33064ddd6f7f904822b9c6b7cb4eeca276658 /meta
parent61e14ad4ebde3508db1ab0a70e77677d8aa571c6 (diff)
downloadast2050-yocto-poky-7f536ba0c1593eff8a85d7d915f00c215bc93d49.zip
ast2050-yocto-poky-7f536ba0c1593eff8a85d7d915f00c215bc93d49.tar.gz
oe-selftest: improve bitbake-layers tests
* Add a test for add-layer and remove-layer * Correct message for test_bitbakelayers_showoverlayed() * Improve test_bitbakelayers_flatten() to use a more unique name for the temp output directory and clean it up using track_for_cleanup() (From OE-Core rev: c4ae1e2c98bee62fcc8db4849b6a4f9a5996a210) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/bblayers.py27
1 files changed, 22 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
index 449c17e..5b046d0 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -29,15 +29,32 @@ class BitbakeLayers(oeSelfTest):
@testcase(90)
def test_bitbakelayers_showoverlayed(self):
result = runCmd('bitbake-layers show-overlayed')
- self.assertTrue('aspell' in result.output, msg='xcursor-transparent-theme_0.1.1.bbappend file was not recognised')
+ self.assertTrue('aspell' in result.output, msg='aspell overlayed recipe was not recognised')
@testcase(95)
def test_bitbakelayers_flatten(self):
- self.assertFalse(os.path.isdir(os.path.join(self.builddir, 'test')))
- result = runCmd('bitbake-layers flatten test')
- bb_file = os.path.join(self.builddir, 'test/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb')
+ testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten')
+ self.assertFalse(os.path.isdir(testoutdir))
+ self.track_for_cleanup(testoutdir)
+ result = runCmd('bitbake-layers flatten %s' % testoutdir)
+ bb_file = os.path.join(testoutdir, 'recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb')
self.assertTrue(os.path.isfile(bb_file))
contents = ftools.read_file(bb_file)
find_in_contents = re.search("##### bbappended from meta-selftest #####\n(.*\n)*include test_recipe.inc", contents)
- shutil.rmtree(os.path.join(self.builddir, 'test'))
self.assertTrue(find_in_contents)
+
+ def test_bitbakelayers_add_remove(self):
+ 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 show-layers')
+ self.assertIn('meta-skeleton', result.output)
+ result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
+ result = runCmd('bitbake-layers show-layers')
+ self.assertNotIn('meta-skeleton', result.output)
+ result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+ result = runCmd('bitbake-layers show-layers')
+ self.assertIn('meta-skeleton', result.output)
+ result = runCmd('bitbake-layers remove-layer */meta-skeleton')
+ result = runCmd('bitbake-layers show-layers')
+ self.assertNotIn('meta-skeleton', result.output)
OpenPOWER on IntegriCloud