Add support for ios_uirobot

build/android/pylib/remote/device/remote_device_environment.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.
 
 """Environment setup and teardown for remote devices."""
 
 import logging
 import os
 import random
 import sys
@@ skipping 47 matching lines @@
     self._api_port = args.api_port
 
     self._access_token = ''
     self._results_path = args.results_path
     self._remote_device = args.remote_device
     self._remote_device_os = args.remote_device_os
     self._runner_package = args.runner_package
     self._runner_type = args.runner_type
     self._device = ''
     self._verbose_count = args.verbose_count
+    self._device_type = args.device_type
     self._timeouts = {
         'queueing': 60 * 10,
         'installing': 60 * 10,
         'in-progress': 60 * 30,
         'unknown': 60 * 5
     }
 
     if not args.trigger and not args.collect:
       self._trigger = True
       self._collect = True
@@ skipping 62 matching lines @@
     """Select which device to use."""
     logging.info('Finding device to run tests on.')
     with appurify_sanitized.SanitizeLogging(self._verbose_count,
                                             logging.WARNING):
       dev_list_res = appurify_sanitized.api.devices_list(self._access_token)
     remote_device_helper.TestHttpResponse(dev_list_res,
                                           'Unable to generate access token.')
     device_list = dev_list_res.json()['response']
     random.shuffle(device_list)
     for device in device_list:
-      if device['os_name'] != 'Android':
+      if device['os_name'] != self._device_type:
         continue
       if self._remote_device and device['name'] != self._remote_device:
         continue
       if (self._remote_device_os
           and device['os_version'] != self._remote_device_os):
         continue
       if ((self._remote_device and self._remote_device_os)
           or device['available_devices_count']):
         logging.info('Found device: %s %s',
                      device['name'], device['os_version'])
         return device
     self._NoDeviceFound(device_list)
 
   def _PrintAvailableDevices(self, device_list):
     def compare_devices(a,b):
       for key in ('os_version', 'name'):
         c = cmp(a[key], b[key])
         if c:
           return c
       return 0
 
-    logging.critical('Available Android Devices:')
-    android_devices = (d for d in device_list if d['os_name'] == 'Android')
-    for d in sorted(android_devices, compare_devices):
+    logging.critical('Available %s Devices:', self._device_type)
+    devices = (d for d in device_list if d['os_name'] == self._device_type)
+    for d in sorted(devices, compare_devices):
       logging.critical('  %s %s', d['os_version'].ljust(7), d['name'])
 
   def _NoDeviceFound(self, device_list):
     self._PrintAvailableDevices(device_list)
     raise remote_device_helper.RemoteDeviceError('No device found.')
 
   @property
   def collect(self):
     return self._collect
 
@@ skipping 26 matching lines @@
   def token(self):
     return self._access_token
 
   @property
   def trigger(self):
     return self._trigger
 
   @property
   def verbose_count(self):
     return self._verbose_count
+
+  @property
+  def device_type(self):
+    return self._device_type