Reland "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 sys
 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._multiple_device_test = False

[jbudorick, 2016/07/15 01:23:19]

O_O

 
   def get_config_defaults(self):
     return {
       'REVISION': self.m.properties.get('revision', ''),
       'CHECKOUT_PATH': self.m.path['checkout'],
     }
 
   @property
+  def multiple_device_test(self):
+    return self._multiple_device_test
+
+  @multiple_device_test.setter
+  def multiple_device_test(self, value):
+    self._multiple_device_test = value
+
+  @property
   def devices(self):
     assert self._devices is not None,\
         'devices is only available after device_status()'
     return self._devices
 
   @property
   def out_path(self):
     return self.m.path['checkout'].join('out')
 
   @property
@@ skipping 336 matching lines @@
     ]
     self.m.step(
         'device_recovery',
         [self.m.path['checkout'].join('third_party', 'catapult', 'devil',
                                       'devil', 'android', 'tools',
                                       'device_recovery.py')] + args,
         env=self.m.chromium.get_env(),
         infra_step=True,
         **kwargs)
 
-  def device_status(self, **kwargs):
+  def device_status(self,  **kwargs):

[jbudorick, 2016/07/15 01:23:19]

nit: no extra space

     buildbot_file = '/home/chrome-bot/.adb_device_info'
     args = [
         '--json-output', self.m.json.output(),
         '--blacklist-file', self.blacklist_file,
         '--known-devices-file', self.known_devices_file,
         '--buildbot-path', buildbot_file,
         '--adb-path', self.m.adb.adb_path(),
         '-v', '--overwrite-known-devices-files',
     ]
     try:
+      device_step_name = 'device_status'

[jbudorick, 2016/07/15 01:23:18]

Why are you optionally changing the step name?

[Ziqi Xiong, 2016/07/15 01:36:06]

I thought it was easier to feed step data and made the test more readable in
that way when I wrote simulation tests. But yeah you are right it isn't really
necessary

+      if self.multiple_device_test:
+        device_step_name = 'multiple_device_status'
       result = self.m.step(
-          'device_status',
+          device_step_name,
           [self.m.path['checkout'].join('third_party', 'catapult', 'devil',
                                         'devil', 'android', 'tools',
                                         'device_status.py')] + args,
           step_test_data=lambda: self.m.json.test_api.output([
               {
                 "battery": {
                     "status": "5",
                     "scale": "100",
                     "temperature": "249",
                     "level": "100",
@@ skipping 965 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)