Support CSV output format for analyzer results.

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
 import os
 import sys
 import time
 
 import layouttests
 import layouttest_analyzer_helpers
 from test_expectations import TestExpectations
 from trend_graph import TrendGraph
 
 # Predefined result directory.
 DEFAULT_RESULT_DIR = 'result'
 DEFAULT_ANNO_FILE = os.path.join('anno', 'anno.csv')
 DEFAULT_GRAPH_FILE = os.path.join('graph', 'graph.html')
+DEFAULT_STATS_CSV_FILENAME = 'stats.csv'
+DEFAULT_ISSUES_CSV_FILENAME = 'issues.csv'
 # Predefined result files for debug.
 CUR_TIME_FOR_DEBUG = '2011-09-11-19'
 CURRENT_RESULT_FILE_FOR_DEBUG = os.path.join(DEFAULT_RESULT_DIR,
                                              CUR_TIME_FOR_DEBUG)
 PREV_TIME_FOR_DEBUG = '2011-09-11-18'
 
 
 def ParseOption():
   """Parse command-line options using OptionParser.
 
@@ skipping 155 matching lines @@
   """
   anno_map = {}
   try:
     file_object = open(bug_annotation_file_location)
   except IOError:
     print 'cannot open annotation file %s. Skipping.' % (
         bug_annotation_file_location)
   else:
     data = csv.reader(file_object)
     for row in data:
-      anno_map[row[0]] = row[1]
+      if len(row) > 1:
+        anno_map[row[0]] = row[1]
     file_object.close()
 
   appended_text_to_email = ''
   if email_appended_text_file_location:
     try:
       file_object = open(email_appended_text_file_location)
     except IOError:
       print 'cannot open email appended text file %s. Skipping.' % (
           email_appended_text_file_location)
     else:
@@ skipping 56 matching lines @@
       (rev_str, simple_rev_str, rev, rev_date) = (
           layouttest_analyzer_helpers.GetRevisionString(prev_time_in_float,
                                                         cur_time_in_float,
                                                         diff_map))
       email_content = analyzer_result_map.ConvertToString(prev_time, diff_map,
                                                           anno_map)
       if receiver_email_address:
         layouttest_analyzer_helpers.SendStatusEmail(
             prev_time, analyzer_result_map, diff_map, anno_map,
             receiver_email_address, test_group_name,
-            appended_text_to_email, email_content, rev_str)
+            appended_text_to_email, email_content, rev_str,
+            email_only_change_mode)
     if simple_rev_str:
       simple_rev_str = '\'' + simple_rev_str + '\''
     else:
       simple_rev_str = 'undefined'  # GViz uses undefined for NONE.
   else:
     # Initial result should be written to tread-graph if there are no previous
     # results.
     result_change = True
     diff_map = None
     simple_rev_str = 'undefined'
+    prev_time = None

[dennis_jeffrey, 2011/11/11 00:01:36]

I think we could remove this line and just put 'None' where needed in line 292
below.

[imasaki1, 2011/11/11 00:25:52]

Done.

+    email_content = analyzer_result_map.ConvertToString(prev_time, diff_map,
+                                                        anno_map)
   return (result_change, diff_map, simple_rev_str, rev, rev_date,
           email_content)
 
 
 def UpdateTrendGraph(start_time, analyzer_result_map, diff_map, simple_rev_str,
                      trend_graph_location):
   """Update trend graph in GViz.
 
   Annotate the graph with revision information.
 
@@ skipping 150 matching lines @@
                                    options.test_group_name,
                                    options.result_directory_location))
   (anno_map, appended_text_to_email) = ReadEmailInformation(
       options.bug_annotation_file_location,
       options.email_appended_text_file_location)
   (result_change, diff_map, simple_rev_str, rev, rev_date, email_content) = (
       SendEmail(prev_time, prev_analyzer_result_map, analyzer_result_map,
                 anno_map, appended_text_to_email,
                 options.email_only_change_mode, options.debug,
                 options.receiver_email_address, options.test_group_name))
+  # Create CSV texts and save them for bug spreadsheet.

[dennis_jeffrey, 2011/11/11 00:01:36]

I recommend adding a blank line right above this, and a blank line right below
line 474 below, to separate the chunk of code related to storing the CSV text
from the rest of the code in this function.

[imasaki1, 2011/11/11 00:25:52]

Done.

+  (stats, issues_txt) = analyzer_result_map.ConvertToCSVText(
+      start_time.strftime('%Y-%m-%d-%H'))
+  file_object = open(os.path.join(options.result_directory_location,
+                                  DEFAULT_STATS_CSV_FILENAME), 'wb')
+  file_object.write(stats)
+  file_object.close()
+  file_object = open(os.path.join(options.result_directory_location,
+                                  DEFAULT_ISSUES_CSV_FILENAME), 'wb')
+  file_object.write(issues_txt)
+  file_object.close()
   if not options.debug and (result_change or not prev_analyzer_result_map):
     # Save the current result when result is changed or the script is
     # executed for the first time.
     date = start_time.strftime('%Y-%m-%d-%H')
     file_path = os.path.join(options.result_directory_location, date)
     analyzer_result_map.Save(file_path)
   if result_change or not prev_analyzer_result_map:
     data_map = UpdateTrendGraph(start_time, analyzer_result_map, diff_map,
                                 simple_rev_str, options.trend_graph_location)
     # Report the result to dashboard.
     if options.dashboard_file_location:
       UpdateDashboard(options.dashboard_file_location, options.test_group_name,
                       data_map, layouttests.DEFAULT_LAYOUTTEST_LOCATION, rev,
                       rev_date, options.receiver_email_address,
                       email_content)
 
 
 if '__main__' == __name__:
   main()