Change CTS filepath format

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 pipes
 import re
@@ skipping 1219 matching lines @@
     is_cts_v2 = (android_platform == 'N')
 
     suffix = ' (%s)' % suffix if suffix else ''
     if command_line_args:
       self._set_webview_command_line(command_line_args)
 
     _CTS_CONFIG_SRC_PATH = self.m.path['checkout'].join(
         'android_webview', 'tools', 'cts_config')
     cts_filenames_json = self.m.file.read(
         'Fetch CTS filename data',
-        _CTS_CONFIG_SRC_PATH.join('webview_cts_gcs_path.json'),
+        _CTS_CONFIG_SRC_PATH.join('webview_cts_gcs_path_new.json'),
         test_data='''
                       {
                         "arm_64": {
-                          "L": "cts_arm64_L.zip"
+                          "L": {
+                            "filename": "cts_arm64_L.zip",
+                            "_origin": "aosp-lollipop-mr1-cts-dev@12345"
+                          },
+                          "N": {
+                            "filename": "cts_arm64_N.zip",
+                            "_origin": "aosp-nougat-cts-release@67890"
+                          }
                         }
                       }''')
     cts_filenames = self.m.json.loads(cts_filenames_json)
+    result = self.m.step.active_result
+    result.presentation.logs['webview_cts_gcs_path.json'] = (
+          cts_filenames_json.splitlines())
     try:
-      cts_filename = cts_filenames[arch][android_platform]
+      cts_filename = cts_filenames[arch][android_platform]["filename"]
     except KeyError:
       raise self.m.step.StepFailure(
           'No CTS test found to use for arch:%s android:%s' % (
               arch, android_platform))
 
     expected_failure_json = self.m.file.read(
         'Fetch expected failures data',
         _CTS_CONFIG_SRC_PATH.join('expected_failure_on_bot.json'),
         test_data = '''
                         {
@@ skipping 36 matching lines @@
       cts_v1_command = [cts_path, 'run', 'cts', '-p', 'android.webkit']
       cts_v2_command = [cts_path, 'run', 'cts', '-m', 'CtsWebkitTestCases']
       self.m.step('Run CTS%s' % suffix,
                   cts_v2_command if is_cts_v2 else cts_v1_command,
                   env=env, stdout=self.m.raw_io.output())
     finally:
       result = self.m.step.active_result
       if result.stdout:
         result.presentation.logs['stdout'] = result.stdout.splitlines()
       result.presentation.logs['disabled_tests'] = (
-          expected_failure_json.split('\n'))
+          expected_failure_json.splitlines())
 
     from xml.etree import ElementTree
 
     def find_test_report_xml(test_output):
       test_results_line = ('Test Result: ' if is_cts_v2 else
                            'Created xml report file at file://')
       if test_output:
         for line in test_output.splitlines():
           split = line.split(test_results_line)
           if (len(split) > 1):
@@ skipping 249 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)