From: Gyorgy Sarvari Date: Mon, 15 Sep 2025 09:02:07 +0000 (+0200) Subject: patchtest: ignore patch file metadata from SRC_URI X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c0febd01e39c6d6a8b7821adcda5f397d597bee;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git patchtest: ignore patch file metadata from SRC_URI The test_src_uri_left_files check prepares a list of patchfiles SRC_URI from before and after the patch is applied, looking for dangling patches. The name of the files in this list can be incorrect, in case the URI contains some extra metadata (like patchdir), because os.path.basename will use the last portion of the line being processed, which is independent from the files in question. To avoid this, try to use only the first portion of URI, before any extra metadata. Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index 63d01819e7..30da8dbe60 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py @@ -150,8 +150,8 @@ class TestMetadata(base.Metadata): "%s-%s-%s" % (self.shortid(), patchtest_patterns.metadata_src_uri, pn) ].split() - pretest_files = set([os.path.basename(patch) for patch in pretest_src_uri if patch.startswith('file://')]) - test_files = set([os.path.basename(patch) for patch in test_src_uri if patch.startswith('file://')]) + pretest_files = set([os.path.basename(patch.split(';')[0]) for patch in pretest_src_uri if patch.startswith('file://')]) + test_files = set([os.path.basename(patch.split(';')[0]) for patch in test_src_uri if patch.startswith('file://')]) # check if files were removed if len(test_files) < len(pretest_files):