diff options
-rwxr-xr-x | scripts/patchtest-send-results | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/patchtest-send-results b/scripts/patchtest-send-results index bb4604aeaf..078651ec38 100755 --- a/scripts/patchtest-send-results +++ b/scripts/patchtest-send-results | |||
@@ -25,12 +25,8 @@ more information:\n\n---\n""" | |||
25 | 25 | ||
26 | suggestions = """\n---\n\nPlease address the issues identified and | 26 | suggestions = """\n---\n\nPlease address the issues identified and |
27 | submit a new revision of the patch, or alternatively, reply to this | 27 | submit a new revision of the patch, or alternatively, reply to this |
28 | email with an explanation of why the patch format should be accepted. | 28 | email with an explanation of why the patch format should be accepted. If |
29 | Note that patchtest may report failures in the merge-on-head test for | 29 | you believe these results are due to an error in patchtest, please |
30 | patches that are part of a series if they rely on changes from | ||
31 | preceeding entries. | ||
32 | |||
33 | If you believe these results are due to an error in patchtest, please | ||
34 | submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' | 30 | submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' |
35 | category under 'Yocto Project Subprojects'). Thank you!""" | 31 | category under 'Yocto Project Subprojects'). Thank you!""" |
36 | 32 | ||
@@ -52,8 +48,6 @@ testresult = None | |||
52 | with open(result_file, "r") as f: | 48 | with open(result_file, "r") as f: |
53 | testresult = f.read() | 49 | testresult = f.read() |
54 | 50 | ||
55 | reply_contents = greeting + testresult + suggestions | ||
56 | |||
57 | # we know these patch files will only contain a single patch, so only | 51 | # we know these patch files will only contain a single patch, so only |
58 | # worry about the first element for getting the subject | 52 | # worry about the first element for getting the subject |
59 | mbox = mailbox.mbox(args.patch) | 53 | mbox = mailbox.mbox(args.patch) |
@@ -61,6 +55,13 @@ mbox_subject = mbox[0]['subject'] | |||
61 | subject_line = f"Patchtest results for {mbox_subject}" | 55 | subject_line = f"Patchtest results for {mbox_subject}" |
62 | 56 | ||
63 | if "FAIL" in testresult: | 57 | if "FAIL" in testresult: |
58 | reply_contents = None | ||
59 | if len(max(open(result_file, 'r'), key=len)) > 220: | ||
60 | warning = "Tests failed for the patch, but the results log could not be processed due to excessive result line length." | ||
61 | reply_contents = greeting + warning + suggestions | ||
62 | else: | ||
63 | reply_contents = greeting + testresult + suggestions | ||
64 | |||
64 | ses_client = boto3.client('ses', region_name='us-west-2') | 65 | ses_client = boto3.client('ses', region_name='us-west-2') |
65 | response = ses_client.send_email( | 66 | response = ses_client.send_email( |
66 | Source='patchtest@automation.yoctoproject.org', | 67 | Source='patchtest@automation.yoctoproject.org', |