diff options
author | Trevor Gamblin <tgamblin@baylibre.com> | 2023-11-29 09:32:41 -0500 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-01-04 04:09:44 -1000 |
commit | 99f26364ced532a20793096cb98679db5c7e279f (patch) | |
tree | 2606d1a40bd2b956069d267a038cd94625f5bfcf | |
parent | 782b0e62ef94225402e82e0db83778cfc4425727 (diff) | |
download | poky-99f26364ced532a20793096cb98679db5c7e279f.tar.gz |
patchtest: shorten patch signed-off-by test output
The patch Signed-off-by test's output line is excessively long, and can
trigger a failsafe in the patchtest automated service's email content
generation. Shorten the output by reducing redundant phrasing and using
os.path.basename to get only the failing patch's name, not the entire
path, as the submitter should have a good idea of where it is located
regardless.
(From OE-Core rev: f6a6af896dd1968eded614b0c519dc375eff407a)
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>
(cherry picked from commit cc7546ded87dd44a988d7a23f1d7645094b5cdd4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/lib/patchtest/tests/test_patch.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/patchtest/tests/test_patch.py b/meta/lib/patchtest/tests/test_patch.py index 65d0f930b0..d7187a0cb1 100644 --- a/meta/lib/patchtest/tests/test_patch.py +++ b/meta/lib/patchtest/tests/test_patch.py | |||
@@ -6,6 +6,7 @@ | |||
6 | # | 6 | # |
7 | 7 | ||
8 | import base | 8 | import base |
9 | import os | ||
9 | import parse_signed_off_by | 10 | import parse_signed_off_by |
10 | import parse_upstream_status | 11 | import parse_upstream_status |
11 | import pyparsing | 12 | import pyparsing |
@@ -87,7 +88,7 @@ class TestPatch(base.Base): | |||
87 | if TestPatch.prog.search_string(payload): | 88 | if TestPatch.prog.search_string(payload): |
88 | break | 89 | break |
89 | else: | 90 | else: |
90 | self.fail('A patch file has been added without a Signed-off-by tag. Sign off the added patch file (%s)' % newpatch.path) | 91 | self.fail('A patch file has been added without a Signed-off-by tag: \'%s\'' % os.path.basename(newpatch.path)) |
91 | 92 | ||
92 | def test_cve_tag_format(self): | 93 | def test_cve_tag_format(self): |
93 | for commit in TestPatch.commits: | 94 | for commit in TestPatch.commits: |