[YOCTO #15314] test_recipetool_appendsrcfile_update_recipe_basic is using base-files as test recipe but modifies it directly which can corrupt metadata for other tests relying on this recipe.
So use mtd-utils-selftest as test recipe from meta-selftest to avoid this kind of issues Signed-off-by: Julien Stephan <jstep...@baylibre.com> --- depends on https://lists.openembedded.org/g/openembedded-core/message/192176 --- meta/lib/oeqa/selftest/cases/recipetool.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index c7f7a066f3a..d7719da70e3 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -1260,23 +1260,16 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase): self.test_recipetool_appendsrcfile_existing_in_src_uri_diff_params(machine='mymachine') def test_recipetool_appendsrcfile_update_recipe_basic(self): - testrecipe = "base-files" + testrecipe = "mtd-utils-selftest" recipefile = get_bb_var('FILE', testrecipe) - result = runCmd('bitbake-layers show-layers') - layerrecipe = None - for line in result.output.splitlines()[3:]: - layer = line.split()[1] - if layer in recipefile: - layerrecipe = layer - break - self.assertTrue(layerrecipe, 'Unable to find the layer containing %s' % testrecipe) - cmd = 'recipetool appendsrcfile -u %s %s %s' % (layerrecipe, testrecipe, self.testfile) + self.assertIn('meta-selftest', recipefile, 'This test expect %s recipe to be in meta-selftest') + cmd = 'recipetool appendsrcfile -W -u meta-selftest %s %s' % (testrecipe, self.testfile) result = runCmd(cmd) self.assertNotIn('Traceback', result.output) self.add_command_to_tearDown('cd %s; rm -f %s/%s; git checkout .' % (os.path.dirname(recipefile), testrecipe, os.path.basename(self.testfile))) expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), - ('??', '.*/%s/%s/%s$' % (testrecipe, testrecipe, os.path.basename(self.testfile)))] + ('??', '.*/%s/%s$' % (testrecipe, os.path.basename(self.testfile)))] self._check_repo_status(os.path.dirname(recipefile), expected_status) result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile)) removelines = [] -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#192182): https://lists.openembedded.org/g/openembedded-core/message/192182 Mute This Topic: https://lists.openembedded.org/mt/103112620/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
