Fix perf exception (WIP DO NOT COMMIT)

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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 datetime
 import json
 import re
 import string
 
 
@@ skipping 1122 matching lines @@
     try:
       if not 'charts' in results:
         step_result.presentation.logs['chartjson_info'] = \
             ['Info: No chart json present']
         return
 
       if not results.get('enabled', True):
         step_result.presentation.logs['chartjson_info'] = \
            ['Info: Benchmark disabled, not sending results to dashboard']
         return
+      import pdb; pdb.set_trace()
 
       # TODO(eyaich): Remove logging once we debug uploading chartjson
       # to perf dashboard
       step_result.presentation.logs['chartjson_info'] = \
           ['Info: Setting up arguments for perf dashboard']
 
-      with api.tempfile.temp_dir('chartjson_results_output') as temp_output_dir:
-        filepath = temp_output_dir.join('chartjson-results.json')
-        api.file.write(name='write results to file',
-                       path=filepath,
-                       data=json.dumps(results))
-        """Produces a step that uploads results to dashboard"""
-        args = [
-            '--chartjson-results-file', filepath,
-            '--perf-id', self._perf_id,
-            '--results-url', self._results_url,
-            '--name', self._perf_dashboard_id,
-            '--buildername', api.properties['buildername'],
-            '--buildnumber', api.properties['buildnumber'],
-        ]
-        if api.chromium.c.build_dir:
-          args.extend(['--build-dir', api.chromium.c.build_dir])
-        if 'got_revision_cp' in api.properties:
-          args.extend(['--got-revision-cp', api.properties['got_revision_cp']])
-        if 'version' in api.properties:
-          args.extend(['--version', api.properties['version']])
-        if 'git_revision' in api.properties:
-          args.extend(['--git-revision', api.properties['git_revision']])
-        if 'got_webrtc_revision' in api.properties:
-          args.extend(['--got-webrtc-revision',
-              api.properties['got_webrtc_revision']])
-        if 'got_v8_revision' in api.properties:
-          args.extend(['--got-v8-revision', api.properties['got_v8_revision']])
+      filepath = api.raw_io.input(data=json.dumps(results))
+      # Produces a step that uploads results to dashboard
+      args = [
+          '--chartjson-results-file', filepath,
+          '--perf-id', self._perf_id,
+          '--results-url', self._results_url,
+          '--name', self._perf_dashboard_id,
+          '--buildername', api.properties['buildername'],
+          '--buildnumber', api.properties['buildnumber'],
+      ]
+      print args
+      print self._name
+      if api.chromium.c.build_dir:
+        args.extend(['--build-dir', api.chromium.c.build_dir])
+      if 'got_revision_cp' in api.properties:
+        args.extend(['--got-revision-cp', api.properties['got_revision_cp']])
+      if 'version' in api.properties:
+        args.extend(['--version', api.properties['version']])
+      if 'git_revision' in api.properties:
+        args.extend(['--git-revision', api.properties['git_revision']])
+      if 'got_webrtc_revision' in api.properties:
+        args.extend(['--got-webrtc-revision',
+            api.properties['got_webrtc_revision']])
+      if 'got_v8_revision' in api.properties:
+        args.extend(['--got-v8-revision', api.properties['got_v8_revision']])
 
-        api.python(
-          'Upload Perf Dashboard Results',
-          api.chromium.package_repo_resource(
-              'scripts', 'slave', 'upload_perf_dashboard_results.py'),
-          args)
+      api.python(
+        'Upload Perf Dashboard Results',
+        api.chromium.package_repo_resource(
+            'scripts', 'slave', 'upload_perf_dashboard_results.py'),
+        args)
 
     except Exception as e:
       step_result.presentation.logs['chartjson_info'].append(
         'Error: Unable to upload chartjson results to perf dashboard')
       step_result.presentation.logs['chartjson_info'].append('%r' % e)
+      raise
 
 
 def generate_isolated_script(api, chromium_tests_api, mastername, buildername,
                              test_spec, bot_update_step, enable_swarming=False,
                              swarming_dimensions=None,
                              scripts_compile_targets=None):
   # Get the perf id and results url if present.
   bot_config = (chromium_tests_api.builders.get(mastername, {})
       .get('builders', {}).get(buildername, {}))
   perf_id = bot_config.get('perf-id')
@@ skipping 691 matching lines @@
           args=args)
       api.gsutil.upload(
           temp_output_dir.join(
               '%s-android-chrome.json' % timestamp_string),
           'chromium-annotated-tests', 'android')
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]