From: Simone Weiß <[email protected]>

Skip the test for checking if CVE_CHECK_IGNORE is not used.
It is deprecated now, but was not deprecated for kirkstone and dunfell.
Skip it therefore if a patch is intended for those branches.

Signed-off-by: Simone Weiß <[email protected]>
---
 meta/lib/patchtest/tests/test_metadata.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/lib/patchtest/tests/test_metadata.py 
b/meta/lib/patchtest/tests/test_metadata.py
index 174dfc31c6..be609dbd04 100644
--- a/meta/lib/patchtest/tests/test_metadata.py
+++ b/meta/lib/patchtest/tests/test_metadata.py
@@ -182,8 +182,10 @@ class TestMetadata(base.Metadata):
                 self.fail('%s is missing in newly added recipe' % 
self.metadata_summary)
 
     def test_cve_check_ignore(self):
-        if not self.modified:
-            self.skip('No modified recipes, skipping test')
+        # Skip if we neither modified a recipe or target branches are not
+        # Nanbield and newer. CVE_CHECK_IGNORE was first deprecated in 
Nanbield.
+        if not self.modified or PatchTestInput.repo.branch == "kirkstone" or 
PatchTestInput.repo.branch == "dunfell":
+            self.skip('No modified recipes or older target branch, skipping 
test')
         for pn in self.modified:
             # we are not interested in images
             if 'core-image' in pn:
-- 
2.39.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196112): 
https://lists.openembedded.org/g/openembedded-core/message/196112
Mute This Topic: https://lists.openembedded.org/mt/104536864/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to