From 4873add6e11c1bd421c83cd08df589f1184aa673 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 2 Nov 2020 18:44:49 -0600 Subject: Revert "poky: subtree update:b23aa6b753..ad30a6d470" This reverts commit af5e4ef732faedf66c6dc1756432e9de2ac72988. This commit introduced openbmc/openbmc#3720 and no solution has been forthcoming. Revert until we can get to the bottom of this. Change-Id: I2fb0d81eb26cf3dadb2f2abdd1a1bb7a95eaf03c --- poky/meta/lib/oeqa/selftest/cases/devtool.py | 24 ----------------------- poky/meta/lib/oeqa/selftest/cases/recipetool.py | 4 ---- poky/meta/lib/oeqa/selftest/cases/runtime_test.py | 1 - 3 files changed, 29 deletions(-) (limited to 'poky/meta/lib/oeqa/selftest/cases') diff --git a/poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py index 0185e670a..4a791ff40 100644 --- a/poky/meta/lib/oeqa/selftest/cases/devtool.py +++ b/poky/meta/lib/oeqa/selftest/cases/devtool.py @@ -520,10 +520,6 @@ 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 @@ -784,26 +780,6 @@ class DevtoolModifyTests(DevtoolBase): self._check_src_repo(tempdir) # This is probably sufficient - def test_devtool_modify_overrides(self): - # Try modifying a recipe with patches in overrides - tempdir = tempfile.mkdtemp(prefix='devtoolqa') - self.track_for_cleanup(tempdir) - self.track_for_cleanup(self.workspacedir) - self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool modify devtool-patch-overrides -x %s' % (tempdir)) - - self._check_src_repo(tempdir) - source = os.path.join(tempdir, "source") - def check(branch, expected): - runCmd('git -C %s checkout %s' % (tempdir, branch)) - with open(source, "rt") as f: - content = f.read() - self.assertEquals(content, expected) - check('devtool', 'This is a test for something\n') - check('devtool-no-overrides', 'This is a test for something\n') - check('devtool-override-qemuarm', 'This is a test for qemuarm\n') - check('devtool-override-qemux86', 'This is a test for qemux86\n') - class DevtoolUpdateTests(DevtoolBase): def test_devtool_update_recipe(self): diff --git a/poky/meta/lib/oeqa/selftest/cases/recipetool.py b/poky/meta/lib/oeqa/selftest/cases/recipetool.py index 9d56e9e1e..6bac53cf3 100644 --- a/poky/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/poky/meta/lib/oeqa/selftest/cases/recipetool.py @@ -409,10 +409,6 @@ 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') diff --git a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py index 1bb1c4bee..d89731c69 100644 --- a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -161,7 +161,6 @@ class TestImage(OESelftestTestCase): features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') features += 'GPG_PATH = "%s"\n' % self.gpg_home - features += 'PSEUDO_IGNORE_PATHS .= ",%s"\n' % self.gpg_home self.write_config(features) # Build core-image-sato and testimage -- cgit v1.2.3