Title: [265442] trunk/Tools
Revision
265442
Author
[email protected]
Date
2020-08-10 12:36:01 -0700 (Mon, 10 Aug 2020)

Log Message

[ews] Handle logs with unicode characters in ews emails
https://bugs.webkit.org/show_bug.cgi?id=215330

Reviewed by Darin Adler.

* BuildSlaveSupport/ews-build/send_email.py:
(send_email): Encode email content as utf-8.
* BuildSlaveSupport/ews-build/steps.py:
(AnalyzeCompileWebKitResults.send_email_for_new_build_failure):
(AnalyzeCompileWebKitResults.send_email_for_preexisting_build_failure):

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/send_email.py (265441 => 265442)


--- trunk/Tools/BuildSlaveSupport/ews-build/send_email.py	2020-08-10 19:29:28 UTC (rev 265441)
+++ trunk/Tools/BuildSlaveSupport/ews-build/send_email.py	2020-08-10 19:36:01 UTC (rev 265442)
@@ -40,7 +40,7 @@
         print('Skipping email since no subject or text is specified')
         return
 
-    email_data = """From: {}\nTo: {}\nSubject: {}\n\n{}""".format(FROM_EMAIL, ', '.join(to_emails), subject, text)
+    email_data = """From: {}\nTo: {}\nSubject: {}\n\n{}""".format(FROM_EMAIL, ', '.join(to_emails), subject, text.encode('utf-8'))
 
     server = smtplib.SMTP(SERVER)
     server.sendmail(FROM_EMAIL, to_emails, email_data)

Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (265441 => 265442)


--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2020-08-10 19:29:28 UTC (rev 265441)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py	2020-08-10 19:36:01 UTC (rev 265442)
@@ -1474,7 +1474,7 @@
             email_text = 'EWS has detected build failure on {} while testing Patch {}.'.format(builder_name, patch_id)
             email_text += '\n\nFull details are available at: {}\n\nPatch author: {}'.format(build_url, patch_author)
             if logs:
-                email_text += '\n\nError lines:\n\n{}'.format(logs)
+                email_text += u'\n\nError lines:\n\n{}'.format(logs)
             email_text += '\n\nTo unsubscrible from these notifications or to provide any feedback please email [email protected]'
             send_email([patch_author], email_subject, email_text)
         except Exception as e:
@@ -1495,7 +1495,7 @@
             email_subject = 'Build failure on trunk on {}'.format(builder_name)
             email_text = 'Failed to build WebKit without patch in {}\n\nBuilder: {}\n\nWorker: {}'.format(build_url, builder_name, worker_name)
             if logs:
-                email_text += '\n\nError lines:\n\n{}'.format(logs)
+                email_text += u'\n\nError lines:\n\n{}'.format(logs)
             send_email_to_bot_watchers(email_subject, email_text)
         except Exception as e:
             print('Error in sending email for build failure: {}'.format(e))

Modified: trunk/Tools/ChangeLog (265441 => 265442)


--- trunk/Tools/ChangeLog	2020-08-10 19:29:28 UTC (rev 265441)
+++ trunk/Tools/ChangeLog	2020-08-10 19:36:01 UTC (rev 265442)
@@ -1,3 +1,16 @@
+2020-08-10  Aakash Jain  <[email protected]>
+
+        [ews] Handle logs with unicode characters in ews emails
+        https://bugs.webkit.org/show_bug.cgi?id=215330
+
+        Reviewed by Darin Adler.
+
+        * BuildSlaveSupport/ews-build/send_email.py:
+        (send_email): Encode email content as utf-8.
+        * BuildSlaveSupport/ews-build/steps.py:
+        (AnalyzeCompileWebKitResults.send_email_for_new_build_failure):
+        (AnalyzeCompileWebKitResults.send_email_for_preexisting_build_failure):
+
 2020-08-10  Wenson Hsieh  <[email protected]>
 
         Add more logging to diagnose editing/selection/ios/select-all-non-editable-text-using-keyboard.html
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to