mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 21:32:13 +02:00
patchtest: clean up test suite
Various tweaks to make the test suite cleaner and more efficient: - Replace use of "re" module with "pyparsing" in tests (but not base.py) - Make test_mbox_cve only check for CVE tags in the commit if the added patch has them - Make test_mbox_cve SKIP instead of PASS if there's no CVE tag - Simplify the bugzilla tag checking test now that pyparsing is used - Modify the selftest script to correctly parse the new result output (From OE-Core rev: 7a187c2475aa762e2bc830950f608143f2535a72) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2fdabc368a
commit
fd06e4f266
@@ -19,12 +19,12 @@
|
||||
|
||||
import base
|
||||
import os
|
||||
import re
|
||||
import pyparsing
|
||||
|
||||
class CVE(base.Base):
|
||||
|
||||
re_cve_pattern = re.compile("CVE\-\d{4}\-\d+", re.IGNORECASE)
|
||||
re_cve_payload_tag = re.compile("\+CVE:(\s+CVE\-\d{4}\-\d+)+")
|
||||
re_cve_pattern = pyparsing.Regex("CVE\-\d{4}\-\d+")
|
||||
re_cve_payload_tag = pyparsing.Regex("\+CVE:(\s+CVE\-\d{4}\-\d+)+")
|
||||
|
||||
def setUp(self):
|
||||
if self.unidiff_parse_error:
|
||||
@@ -39,10 +39,10 @@ class CVE(base.Base):
|
||||
|
||||
def test_cve_tag_format(self):
|
||||
for commit in CVE.commits:
|
||||
if self.re_cve_pattern.search(commit.shortlog) or self.re_cve_pattern.search(commit.commit_message):
|
||||
if self.re_cve_pattern.search_string(commit.shortlog) or self.re_cve_pattern.search_string(commit.commit_message):
|
||||
tag_found = False
|
||||
for line in commit.payload.splitlines():
|
||||
if self.re_cve_payload_tag.match(line):
|
||||
if self.re_cve_payload_tag.search_string(line):
|
||||
tag_found = True
|
||||
break
|
||||
if not tag_found:
|
||||
|
||||
Reference in New Issue
Block a user