Updating isolate scripts to read in chartjson telemetry results

testing/scripts/run_telemetry_benchmark_as_googletest.py

 #!/usr/bin/env python
 # Copyright 2015 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 an isolate bundled Telemetry benchmark.
 
 This script attempts to emulate the contract of gtest-style tests
 invoked via recipes. The main contract is that the caller passes the
 argument:
@@ skipping 26 matching lines @@
 # Importing it and using its get_sandbox_env breaks test runs on Linux
 # (it seems to unset DISPLAY).
 CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX'
 CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox'
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument(
       '--isolated-script-test-output', type=argparse.FileType('w'),
       required=True)
+  parser.add_argument(
+      '--isolated-script-test-chartjson-output', type=argparse.FileType('w'),
+      required=False)

[Ken Russell (switch to Gerrit), 2016/09/17 02:39:56]

Sorry, I only just realized this: since you're passing this argument into the
isolated script tests all the time in https://codereview.chromium.org/2336293002
, you need to add this argument to all of the isolated script test wrappers in
this directory:
run_telemetry_as_googletest.py
run_telemetry_benchmark_as_googletest.py
run_gpu_integration_test_as_googletest.py

and drop it on the floor for the ones that don't care about it.

[eyaich1, 2016/09/19 15:20:50]

Done.

   parser.add_argument('--xvfb', help='Start xvfb.', action='store_true')
   args, rest_args = parser.parse_known_args()
   xvfb_proc = None
   openbox_proc = None
   xcompmgr_proc = None
   env = os.environ.copy()
   # Assume we want to set up the sandbox environment variables all the
   # time; doing so is harmless on non-Linux platforms and is needed
   # all the time on Linux.
   env[CHROME_SANDBOX_ENV] = CHROME_SANDBOX_PATH
   if args.xvfb and xvfb.should_start_xvfb(env):
     xvfb_proc, openbox_proc, xcompmgr_proc = xvfb.start_xvfb(env=env,
                                                              build_dir='.')
     assert xvfb_proc and openbox_proc and xcompmgr_proc, 'Failed to start xvfb'
   try:
     tempfile_dir = tempfile.mkdtemp('telemetry')
     valid = True
     failures = []
+    chartjson = (args.isolated_script_test_chartjson_output is not None and
+      '--output-format=chartjson' in rest_args)
+    chartresults = None
     try:
       rc = common.run_command([sys.executable] + rest_args + [
         '--output-dir', tempfile_dir,
         '--output-format=json'
       ], env=env)
       tempfile_name = os.path.join(tempfile_dir, 'results.json')
       with open(tempfile_name) as f:
         results = json.load(f)
       for value in results['per_page_values']:
         if value['type'] == 'failure':
           failures.append(results['pages'][str(value['page_id'])]['name'])
       valid = bool(rc == 0 or failures)
+      # If we have also output chartjson read it in and return it.
+      # results-chart.json is the file name output by telemetry when the
+      # chartjson output format is included
+      if chartjson:
+        chart_tempfile_name = os.path.join(tempfile_dir, 'results-chart.json')
+        with open(chart_tempfile_name) as f:
+          chartresults = json.load(f)
     except Exception:
       traceback.print_exc()
       valid = False
     finally:
       shutil.rmtree(tempfile_dir)
 
     if not valid and not failures:
       failures = ['(entire test suite)']
       if rc == 0:
         rc = 1  # Signal an abnormal exit.
 
+    if chartjson:
+      json.dump(chartresults, args.isolated_script_test_chartjson_output)
+
     json.dump({
         'valid': valid,
-        'failures': failures,
+        'failures': failures
     }, args.isolated_script_test_output)
     return rc
 
   finally:
     xvfb.kill(xvfb_proc)
     xvfb.kill(openbox_proc)
     xvfb.kill(xcompmgr_proc)
 
 
 # This is not really a "script test" so does not need to manually add
 # any additional compile targets.
 def main_compile_targets(args):
   json.dump([], args.output)
 
 
 if __name__ == '__main__':
   # Conform minimally to the protocol defined by ScriptTest.
   if 'compile_targets' in sys.argv:
     funcs = {
       'run': None,
       'compile_targets': main_compile_targets,
     }
     sys.exit(common.run_script(sys.argv[1:], funcs))
   sys.exit(main())