Android buildbot fixes

build/android/pylib/test_result.py

 # Copyright (c) 2012 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.
 
 
 import json
 import logging
 import os
+import re
 import time
 import traceback
 
 import buildbot_report
 import constants
 import flakiness_dashboard_results_uploader
 
 
 class BaseTestResult(object):
   """A single result from a unit test."""
@@ skipping 107 matching lines @@
     """Returns the all broken tests including failed, crashed, unknown."""
     return self.failed + self.crashed + self.unknown
 
   def _LogToFile(self, test_type, test_suite, build_type):
     """Log results to local files which can be used for aggregation later."""
     # TODO(frankf): Report tests that failed to run here too.
     log_file_path = os.path.join(constants.CHROME_DIR, 'out',
                                  build_type, 'test_logs')
     if not os.path.exists(log_file_path):
       os.mkdir(log_file_path)
-    full_file_name = os.path.join(log_file_path, test_type)
+    full_file_name = os.path.join(
+        log_file_path, re.sub('\W', '_', test_type).lower() + '.log')

[frankf, 2012/12/26 18:23:59]

how are the files unique after this change?

[Isaac (away), 2012/12/26 19:24:14]

They make it easier to differentiate the log files with the .json files in the
same directory.

     if not os.path.exists(full_file_name):
       with open(full_file_name, 'w') as log_file:
         print >> log_file, '\n%s results for %s build %s:' % (
             test_type, os.environ.get('BUILDBOT_BUILDERNAME'),
             os.environ.get('BUILDBOT_BUILDNUMBER'))
       logging.info('Writing results to %s.' % full_file_name)
     log_contents = ['  %s result : %d tests ran' % (test_suite,
                                                     len(self.ok) +
                                                     len(self.failed) +
                                                     len(self.crashed) +
@@ skipping 100 matching lines @@
 
       if flakiness_server:
         self._LogToFlakinessDashboard(test_type, test_package, flakiness_server)
 
   def PrintAnnotation(self):
     """Print buildbot annotations for test results."""
     if self.failed or self.crashed or self.overall_fail or self.timed_out:
       buildbot_report.PrintError()
     else:
       print 'Step success!'  # No annotation needed