From: Trevor Gamblin <tgamblin@baylibre.com>
Date: Sat, 31 Aug 2024 01:39:03 +0000 (-0400)
Subject: patchtest: test_shortlog_length: omit shortlog prefixes
X-Git-Tag: yocto-5.1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e1ddadfe779291cf46fb88fb01769c022b733ac;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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].

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>
---

diff --git a/meta/lib/patchtest/tests/test_mbox.py b/meta/lib/patchtest/tests/test_mbox.py
index ae16c4bf934..0e3d055780a 100644
--- a/meta/lib/patchtest/tests/test_mbox.py
+++ b/meta/lib/patchtest/tests/test_mbox.py
@@ -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)