From bd2159719c08c101a25a5012fc684163135653e6 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Sat, 31 Aug 2024 20:51:19 -0400 Subject: [PATCH] patchtest: test_non_auh_upgrade: improve parse logic The AUH email address used for matching was outdated. Fix it so that it correctly identifies emails using the new one. Also make sure to only scan the commit message and not the body, since it's possible (like in this patch) that the user may be editing actual code that checks for AUH-related strings. Fixes [YOCTO #15390]. (From OE-Core rev: 557400648b6f4f31176847f8a068d2e199b7793d) Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/patchtest/tests/test_mbox.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/patchtest/tests/test_mbox.py b/meta/lib/patchtest/tests/test_mbox.py index 0e3d055780..cd76e58a71 100644 --- a/meta/lib/patchtest/tests/test_mbox.py +++ b/meta/lib/patchtest/tests/test_mbox.py @@ -23,7 +23,7 @@ def headlog(): class TestMbox(base.Base): - auh_email = 'auh@auh.yoctoproject.org' + auh_email = 'auh@yoctoproject.org' invalids = [pyparsing.Regex("^Upgrade Helper.+"), pyparsing.Regex(auh_email), @@ -155,5 +155,5 @@ class TestMbox(base.Base): def test_non_auh_upgrade(self): for commit in self.commits: - if self.auh_email in commit.payload: + if self.auh_email in commit.commit_message: self.fail('Invalid author %s. Resend the series with a valid patch author' % self.auh_email, commit=commit)