mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
patchtest: test_shortlog_length: omit shortlog prefixes
In certain cases, the shortlog for a patch would include branch and 'PATCH' tag information even after the repo tag got stripped out, padding it with data that wouldn't actually be included with a merge. This caused the patchtest test_shortlog_length test to erroneously report a failure. For example, a patch whose shortlog tags were: [OE-core][master/scarthgap][PATCH] would leave this behind in the shortlog, along with the actual content: [master/scarthgap][PATCH] Add a re.sub() call in the test to fix this by removing all square bracket pairs that appear at the beginning of the string. Fixes [YOCTO #15575]. (From OE-Core rev: 6e1ddadfe779291cf46fb88fb01769c022b733ac) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6f66cf7694
commit
3802372a2a
@@ -9,6 +9,7 @@ import collections
|
||||
import parse_shortlog
|
||||
import parse_signed_off_by
|
||||
import pyparsing
|
||||
import re
|
||||
import subprocess
|
||||
from data import PatchTestInput
|
||||
|
||||
@@ -82,7 +83,7 @@ class TestMbox(base.Base):
|
||||
def test_shortlog_length(self):
|
||||
for commit in TestMbox.commits:
|
||||
# no reason to re-check on revert shortlogs
|
||||
shortlog = commit.shortlog
|
||||
shortlog = re.sub('^(\[.*?\])+ ', '', commit.shortlog)
|
||||
if shortlog.startswith('Revert "'):
|
||||
continue
|
||||
l = len(shortlog)
|
||||
|
||||
Reference in New Issue
Block a user