Allow multiple devices on bisects hosts

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 urllib
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 
 
 def _TimestampToIsoFormat(timestamp):
   return datetime.datetime.utcfromtimestamp(timestamp).strftime('%Y%m%dT%H%M%S')
 
 
 class AndroidApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(AndroidApi, self).__init__(**kwargs)
     self._devices = None
     self._file_changes_path = None
+    self.device_to_test = None

[RobertoCN, 2016/06/10 15:50:17]

Maybe these belong on the auto_bisect api. (since chromium_android is not
test-specific)

[Ziqi Xiong, 2016/06/22 17:38:21]

Done.

+    self.device_tested = []
 
   def get_config_defaults(self):
     return {
       'REVISION': self.m.properties.get('revision', ''),
       'CHECKOUT_PATH': self.m.path['checkout'],
     }
 
   @property
   def devices(self):
     assert self._devices is not None,\
@@ skipping 964 matching lines @@
     # WebView user agent is changed, and new CTS hasn't been published to
     # reflect that.
     expected_failure_json = self.m.file.read(
         'Fetch the expected failures tests for CTS from chromium checkout',
         _CTS_CONFIG_SRC_PATH.join('expected_failure_on_bot.json'),
         test_data = '''
                         {
                           "android.webkit.cts.ExampleBlacklistedTest":
                             [
                               {
-                                "name": "testA", 
+                                "name": "testA",
                                 "_bug_id": "crbug.com/123"
                               },
                               {"name": "testB"}
                             ]
                           }'''
         )
     expected_failure = self.m.json.loads(expected_failure_json)
-    
+
     cts_base_dir = self.m.path['build'].join('site_config', 'cts')
     cts_zip_path = cts_base_dir.join(_cts_file_name)
     cts_extract_dir = cts_base_dir.join('unzipped')
     if not self.m.path.exists(cts_zip_path):
       with self.m.step.nest('Update CTS'):
         # Remove all old cts files before downloading new one.
         self.m.file.rmtree('Delete old CTS', cts_base_dir)
         self.m.file.makedirs('Create CTS dir', cts_base_dir)
         self.m.gsutil.download(name='Download new CTS',
                                bucket='chromium-cts',
@@ skipping 37 matching lines @@
 
     for test_class in test_classes:
       class_name = 'android.webkit.cts.%s' % test_class.get('name')
       test_methods = test_class.findall('./Test')
 
       for test_method in test_methods:
         method_name = '%s#%s' % (class_name, test_method.get('name'))
         if test_method.get('result') == 'notExecuted':
           not_executed_tests.append(method_name)
         elif (test_method.find('./FailedScene') is not None and
-              test_method.get('name') not in 
-                [ t.get('name') for t in 
+              test_method.get('name') not in
+                [ t.get('name') for t in
                   expected_failure.get(class_name, []) ]):
           unexpected_test_failures.append(method_name)
 
     if unexpected_test_failures or not_executed_tests:
       self.m.step.active_result.presentation.status = self.m.step.FAILURE
       self.m.step.active_result.presentation.step_text += (
           self.m.test_utils.format_step_text(
               [['unexpected failures:', unexpected_test_failures],
                ['not executed:', not_executed_tests]]))
 
@@ skipping 209 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)