Added an option to append text at the end of the status email in layout test analyzer tool.

Review URL: http://codereview.chromium.org/7789008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99805 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 38 insertions, 10 deletions

diff --git a/media/tools/layout_tests/layouttest_analyzer.py b/media/tools/layout_tests/layouttest_analyzer.py
index b7045a6..60b688e 100644
--- a/media/tools/layout_tests/layouttest_analyzer.py
+++ b/media/tools/layout_tests/layouttest_analyzer.py
@@ -79,6 +79,13 @@ def parse_option():
                              help=('Name of result directory location '
                                    '(default to %default)'),
                              default=DEFAULT_RESULT_DIR)
+    option_parser.add_option('-b', '--email-appended-text-file-location',
+                             dest='email_appended_text_file_location',
+                             help=('File location of the email appended text. '
+                                   'The text is appended in the status email. '
+                                   '(default to %default and no text is '
+                                   'appended in that case.)'),
+                             default=None)
     return option_parser.parse_args()[0]
 
 
@@ -105,17 +112,35 @@ def main():
   # Read bug annotations and generate an annotation map used for the status
   # email.
   anno_map = {}
-  file_object = open(options.bug_annotation_file_location)
-  data = csv.reader(file_object)
-  for row in data:
-    anno_map[row[0]] = row[1]
-  file_object.close()
+  try:
+    file_object = open(options.bug_annotation_file_location)
+  except IOError:
+    print 'cannot open annotation file %s. Skipping.' % (
+        options.bug_annotation_file_location)
+  else:
+    data = csv.reader(file_object)
+    for row in data:
+      anno_map[row[0]] = row[1]
+    file_object.close()
+
+  appended_text_to_email = ''
+  if options.email_appended_text_file_location:
+    try:
+      file_object = open(options.email_appended_text_file_location)
+    except IOError:
+      print 'cannot open email appended text file %s. Skipping.' % (
+          options.email_appended_text_file_location)
+    else:
+      appended_text_to_email = ''.join(file_object.readlines())
+      file_object.close()
+
 
   layouttest_analyzer_helpers.SendStatusEmail(prev_time, analyzer_result_map,
                                               prev_analyzer_result_map,
                                               anno_map,
                                               options.receiver_email_address,
-                                              options.test_group_name)
+                                              options.test_group_name,
+                                              appended_text_to_email)
   if not options.debug:
     # Save the current result.
     date = start_time.strftime('%Y-%m-%d-%H')
diff --git a/media/tools/layout_tests/layouttest_analyzer_helpers.py b/media/tools/layout_tests/layouttest_analyzer_helpers.py
index ef5012c..6277295 100644
--- a/media/tools/layout_tests/layouttest_analyzer_helpers.py
+++ b/media/tools/layout_tests/layouttest_analyzer_helpers.py
@@ -265,7 +265,8 @@ class AnalyzerResultMap:
 
 
 def SendStatusEmail(prev_time, analyzer_result_map, prev_analyzer_result_map,
-                    bug_anno_map, receiver_email_address, test_group_name):
+                    bug_anno_map, receiver_email_address, test_group_name,
+                    appended_text_to_email):
   """Send status email.
 
   Args:
@@ -273,11 +274,13 @@ def SendStatusEmail(prev_time, analyzer_result_map, prev_analyzer_result_map,
         used in this analyzer.
     analyzer_result_map: current analyzer result.
     prev_analyzer_result_map: previous analyzer result, which is read from
-         a file.
+        a file.
     bug_anno_map: bug annotation map where bug name and annotations are
-         stored.
+        stored.
     receiver_email_address: receiver's email address.
     test_group_name: string representing the test group name (e.g., 'media').
+    appended_text_to_email: a text which is appended at the end of the status
+        email.
   """
   diff_map = analyzer_result_map.CompareToOtherResultMap(
       prev_analyzer_result_map)
@@ -315,7 +318,7 @@ def SendStatusEmail(prev_time, analyzer_result_map, prev_analyzer_result_map,
                                                       localtime)
   SendEmail('imasaki@chromium.org', 'Kenji Imasaki',
             [receiver_email_address], ['Layout Test Analyzer Result'], subject,
-            str)
+            str + appended_text_to_email)
 
 
 def SendEmail(sender_email_address, sender_name, receivers_email_addresses,