Surface test times of android tests.

build/android/pylib/perf/test_runner.py

 # Copyright 2013 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.
 
 """Runs perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 48 matching lines @@
 import time
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 
 
+def GetPersistedResult(test_name):
+  file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
+  if not os.path.exists(file_name):
+    logging.error('File not found %s', file_name)
+    return None
+
+  with file(file_name, 'r') as f:
+    return pickle.loads(f.read())
+
+
 def OutputJsonList(json_input, json_output):
   with file(json_input, 'r') as i:
     all_steps = json.load(i)
-  step_values = [{'test': k, 'device_affinity': v['device_affinity']}
-      for k, v in all_steps['steps'].iteritems()]
+
+  step_values = []
+  for k, v in all_steps['steps'].iteritems():
+    data = {'test': k,
+            'device_affinity': v['device_affinity'],
+            'total_time': -1}

[Sami, 2015/05/13 18:39:18]

Not sure if it makes more sense to set the total time to -1 or just leave out
'total_time' completely if we don't have results. I'll leave it to you to
decide.

+
+    persisted_result = GetPersistedResult(k)
+    if persisted_result:
+      data['total_time'] = persisted_result['total_time']
+    step_values.append(data)
+
   with file(json_output, 'w') as o:
     o.write(json.dumps(step_values))
   return 0
 
 
 def PrintTestOutput(test_name, json_file_name=None):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
     json_file_name: name of the file to output chartjson data to.
 
   Returns:
     exit code generated by the test step.
   """
-  file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
-  if not os.path.exists(file_name):
-    logging.error('File not found %s', file_name)
+  persisted_result = GetPersistedResult(test_name)
+  if not persisted_result:
     return 1
-
-  with file(file_name, 'r') as f:
-    persisted_result = pickle.loads(f.read())
   logging.info('*' * 80)
   logging.info('Output from:')
   logging.info(persisted_result['cmd'])
   logging.info('*' * 80)
   print persisted_result['output']
 
   if json_file_name:
     with file(json_file_name, 'w') as f:
       f.write(persisted_result['chartjson'])
 
@@ skipping 223 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     _, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry