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

media/tools/layout_tests/layouttest_analyzer.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Main functions for the Layout Test Analyzer module."""
 
 import csv
 from datetime import datetime
 import optparse
@@ skipping 61 matching lines @@
     option_parser.add_option('-x', '--test-group-name',
                              dest='test_group_name',
                              help=('Name of test group '
                                    '(default to %default)'),
                              default=DEFAULT_TEST_GROUP_NAME)
     option_parser.add_option('-d', '--result-directory-location',
                              dest='result_directory_location',
                              help=('Name of result directory location '
                                    '(default to %default)'),
                              default=DEFAULT_RESULT_DIR)
+    option_parser.add_option('-b', '--email-insert-text-file-location',
+                             dest='email_insert_text_file_location',
+                             help=('File location of the email insert text. '
+                                   'The text is included in the status email. '
+                                   '(default to %default)'),

[dennis_jeffrey, 2011/09/06 19:25:55]

You might want to clarify that in the default case, no additional text is
inserted into the e-mail.

[imasaki1, 2011/09/06 20:26:10]

Done.

+                             default=None)
     return option_parser.parse_args()[0]
 
 
 def main():
   """A main function for the analyzer."""
   options = parse_option()
   start_time = datetime.now()
 
   # Do the main analysis.
   if not options.debug:
@@ skipping 12 matching lines @@
 
   # 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()
 
+  appended_text_to_email = ''
+  if options.email_insert_text_file_location:
+    file_object = open(options.email_insert_text_file_location)

[dennis_jeffrey, 2011/09/06 19:25:55]

We should check to make sure the file exists before doing this, or else wrap
this code inside a try/except so that the code gracefully handles the case when
we have a problem reading from the input file.

[imasaki1, 2011/09/06 20:26:10]

Done. Also changed annotation file reading part.

+    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')
     file_path = os.path.join(options.result_directory_location, date)
     analyzer_result_map.Save(file_path)
 
   # Trend graph update (if specified in the command-line argument).
   trend_graph = TrendGraph(options.trend_graph_location)
   datetime_string = start_time.strftime('%Y,%m,%d,%H,%M,%S')
   # TODO(imasaki): add correct title and text instead of 'undefined'.
   data_map = (
       {'whole': (str(len(analyzer_result_map.result_map['whole'].keys())),
                  'undefined', 'undefined'),
        'skip': (str(len(analyzer_result_map.result_map['skip'].keys())),
                 'undefined', 'undefined'),
        'nonskip': (str(len(analyzer_result_map.result_map['nonskip'].keys())),
                    'undefined', 'undefined'),
        'passingrate': (str(analyzer_result_map.GetPassingRate()),
                        'undefined', 'undefined')})
   trend_graph.Update(datetime_string, data_map)
 
 
 if '__main__' == __name__:
   main()