From 961de02fd14bcd201a07a69eb3287be76084a5a2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 7 Oct 2020 19:21:50 +0100 Subject: selftest: skip npm tests if nodejs-native isn't available 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/devtool.py | 4 ++++ meta/lib/oeqa/selftest/cases/recipetool.py | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 4a791ff40e..2c9ff7a95a 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -520,6 +520,10 @@ class DevtoolAddTests(DevtoolBase): self._test_recipe_contents(recipefile, checkvars, []) 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' pv = '1.0.0' url = 'npm://registry.npmjs.org;package=@savoirfairelinux/node-server-example;version=' + pv diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 6bac53cf3d..9d56e9e1e3 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -409,6 +409,10 @@ class RecipetoolTests(RecipetoolBase): self._test_recipe_contents(recipefile, checkvars, inherits) 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') os.makedirs(temprecipe) recipefile = os.path.join(temprecipe, 'savoirfairelinux-node-server-example_1.0.0.bb') -- cgit v1.2.3-54-g00ecf