[Android] Enable uploading instrumentation tests to flakiness dashboard.

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
+from pylib.utils import flakiness_dashboard_results_uploader
+
+
+_STAGING_SERVER = 'chrome-android-staging'
 
 
 class BaseTestResult(object):
   """A single result from a unit test."""
 
   def __init__(self, name, log):
     self.name = name
     self.log = log.replace('\r', '')
 
 
@@ skipping 134 matching lines @@
                'failed': [t.name for t in self.failed],
                'crashed': [t.name for t in self.failed],
                'unknown': [t.name for t in self.unknown],}
     json_file_path = os.path.join(log_file_path, 'results.json')
     with open(json_file_path, 'a') as json_file:
       print >> json_file, json.dumps(content)
     logging.info('Writing results to %s.' % json_file_path)
 
   def _LogToFlakinessDashboard(self, test_type, test_package, flakiness_server):
     """Upload results to the flakiness dashboard"""
-    # TODO(frankf): Fix upstream/downstream reporting for both test types.
-    logging.info('Upload %s %s to %s' % (test_type, test_package,
-                                         flakiness_server))
-    flakiness_dashboard_results_uploader.Upload(
-        flakiness_server, 'Chromium_Android_Instrumentation', self)
+    logging.info('Upload results for test type "%s", test package "%s" to %s' %
+                 (test_type, test_package, flakiness_server))
+
+    # TODO(frankf): Enable uploading for gtests.
+    if test_type != 'Instrumentation':
+      logging.warning('Invalid test type.')
+      return
+
+    try:
+      # TODO(frankf): Temp server for initial testing upstream.
+      # Use http://test-results.appspot.com once we're confident this works.
+      if _STAGING_SERVER in flakiness_server:
+          assert test_package in ['ContentShellTest',
+                                  'ChromiumTestShellTest',
+                                  'AndroidWebViewTest']
+          dashboard_test_type = ('%s_instrumentation_tests' %
+                                 test_package.lower().rstrip('test'))
+      # Downstream prod server.
+      else:
+        dashboard_test_type = 'Chromium_Android_Instrumentation'
+
+      flakiness_dashboard_results_uploader.Upload(
+          flakiness_server, dashboard_test_type, self)
+    except Exception as e:
+      logging.error(e)
 
   def LogFull(self, test_type, test_package, annotation=None,
               build_type='Debug', all_tests=None, flakiness_server=None):
     """Log the tests results for the test suite.
 
     The results will be logged three different ways:
       1. Log to stdout.
       2. Log to local files for aggregating multiple test steps
          (on buildbots only).
       3. Log to flakiness dashboard (on buildbots only).
@@ skipping 64 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