mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

selftest: skip npm tests if nodejs-native isn't available

Browse Source 
The tests are actually skipped if meta-oe isn't present which isn't
quite the same thing, but hopefully close enough.

(From OE-Core rev: d22ed015d8f38241acb783e1a468fb15d4317670)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2020-10-07 19:21:50 +01:00
committed by Richard Purdie
parent 197cec77f5
commit 961de02fd1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/oeqa/selftest/cases/devtool.py
View File

@@ -520,6 +520,10 @@ class DevtoolAddTests(DevtoolBase):
self._test_recipe_contents(recipefile, checkvars, []) self._test_recipe_contents(recipefile, checkvars, [])
def test_devtool_add_npm(self): def test_devtool_add_npm(self):
collections = get_bb_var('BBFILE_COLLECTIONS').split()
if "openembedded-layer" not in collections:
self.skipTest("Test needs meta-oe for nodejs")
pn = 'savoirfairelinux-node-server-example' pn = 'savoirfairelinux-node-server-example'
pv = '1.0.0' pv = '1.0.0'
url = 'npm://registry.npmjs.org;package=@savoirfairelinux/node-server-example;version=' + pv url = 'npm://registry.npmjs.org;package=@savoirfairelinux/node-server-example;version=' + pv

4
meta/lib/oeqa/selftest/cases/recipetool.py
View File

@@ -409,6 +409,10 @@ class RecipetoolTests(RecipetoolBase):
self._test_recipe_contents(recipefile, checkvars, inherits) self._test_recipe_contents(recipefile, checkvars, inherits)
def test_recipetool_create_npm(self): def test_recipetool_create_npm(self):
collections = get_bb_var('BBFILE_COLLECTIONS').split()
if "openembedded-layer" not in collections:
self.skipTest("Test needs meta-oe for nodejs")
temprecipe = os.path.join(self.tempdir, 'recipe') temprecipe = os.path.join(self.tempdir, 'recipe')
os.makedirs(temprecipe) os.makedirs(temprecipe)
recipefile = os.path.join(temprecipe, 'savoirfairelinux-node-server-example_1.0.0.bb') recipefile = os.path.join(temprecipe, 'savoirfairelinux-node-server-example_1.0.0.bb')