Do not assume that perf tests always have end_time

scripts/slave/recipe_modules/chromium_android/api.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.
 
 import contextlib
 import datetime
 import json
 import os
 import re
 import sys
@@ skipping 722 matching lines @@
                             enable_platform_mode=enable_platform_mode, **kwargs)
 
     # now obtain the list of tests that were executed.
     result = self.test_runner(
         'get perf test list',
         ['perf', '--steps', config, '--output-json-list', self.m.json.output(),
          '--blacklist-file', self.blacklist_file],
         step_test_data=lambda: self.m.json.test_api.output([
             {'test': 'perf_test.foo', 'device_affinity': 0,
              'end_time': 1443438432.949711, 'has_archive': True},
-            {'test': 'page_cycler.foo', 'device_affinity': 0,
-             'end_time': 1470050195.193213}]),
+            {'test': 'page_cycler.foo', 'device_affinity': 0}]),
         env=self.m.chromium.get_env()
     )
     perf_tests = result.json.output
 
     if perf_tests and isinstance(perf_tests[0], dict):
       perf_tests = sorted(perf_tests,
           key=lambda x: (x['device_affinity'], x['test']))
     else:
       perf_tests = [{'test': v} for v in perf_tests]
 
     failures = []
     for test_data in perf_tests:
       test_name = str(test_data['test'])  # un-unicode
       test_type = test_type_transform(test_name)
       annotate = self.m.chromium.get_annotate_by_test_name(test_name)
-      point_id = int(test_data['end_time']) if timestamp_as_point_id else None
+      test_end_time = int(test_data.get('end_time', 0))
+      if not test_end_time:
+        test_end_time = int(self.m.time.time())
+      point_id = test_end_time if timestamp_as_point_id else None
 
       if upload_archives_to_bucket and test_data.get('has_archive'):
         archive = self.m.path.mkdtemp('perf_archives').join('output_dir.zip')
       else:
         archive = None
       print_step_cmd = ['perf', '--print-step', test_name, '--verbose',
                         '--adb-path', self.m.adb.adb_path(),
                         '--blacklist-file', self.blacklist_file]
       if archive:
         print_step_cmd.extend(['--get-output-dir-archive', archive])
@@ skipping 22 matching lines @@
         if 'device_affinity' in test_data:
           step_result = self.m.step.active_result
           step_result.presentation.step_text += (
               self.m.test_utils.format_step_text(
                   [['Device Affinity: %s' % test_data['device_affinity']]]))
 
       if archive:
         dest = '{builder}/{test}/{timestamp}_build_{buildno}.zip'.format(
           builder=self.m.properties['buildername'],
           test=test_name,
-          timestamp=_TimestampToIsoFormat(test_data['end_time']),
+          timestamp=_TimestampToIsoFormat(test_end_time),
           buildno=self.m.properties['buildnumber'])
         self.m.gsutil.upload(
           name='upload %s output dir archive' % test_name,
           source=archive,
           bucket=upload_archives_to_bucket,
           dest=dest,
           link_name='output_dir.zip')
 
     if failures:
       raise self.m.step.StepFailure('sharded perf tests failed %s' % failures)
@@ skipping 655 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)