From 2fdabc368a52a9bf60f76f33e92b94de843688a8 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 12 Oct 2023 09:24:58 -0400 Subject: patchtest: improve test issue messages The patchtest tests provide vague feedback to the user, and many of them also provide redundant 'fix' strings that could easily be incorporated into the issue messages themselves. Simplify them so that it is more clear what the errors are and how they can be addressed. No recommendation is given when the issue string adequately conveys the issue, e.g. with a missing "LICENSE" entry in a newly-created recipe. (From OE-Core rev: 0bfb3614244ec7aa79b6424bc63f9f2bccdabe98) Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/lib/patchtest/tests/test_mbox_merge.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/lib/patchtest/tests/test_mbox_merge.py') diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py index c8b6718d15..a7e0821e72 100644 --- a/meta/lib/patchtest/tests/test_mbox_merge.py +++ b/meta/lib/patchtest/tests/test_mbox_merge.py @@ -20,6 +20,5 @@ class Merge(base.Base): def test_series_merge_on_head(self): if not PatchTestInput.repo.ismerged: commithash, author, date, shortlog = headlog() - self.fail('Series does not apply on top of target branch', - 'Rebase your series on top of targeted branch', + self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct', data=[('Targeted branch', '%s (currently at %s)' % (PatchTestInput.repo.branch, commithash))]) -- cgit v1.2.3-54-g00ecf