Clean up logging and add device randomization.

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
 
 from pylib import constants
 from pylib.base import environment
 from pylib.remote.device import appurify_sanitized
 from pylib.remote.device import remote_device_helper
 
 class RemoteDeviceEnvironment(environment.Environment):
   """An environment for running on remote devices."""
 
@@ skipping 34 matching lines @@
       error_func('Must set api port with --api-port.')
     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
+
     if not args.trigger and not args.collect:
       self._trigger = True
       self._collect = True
     else:
       self._trigger = args.trigger
       self._collect = args.collect
 
   def SetUp(self):
     """Set up the test environment."""
     os.environ['APPURIFY_API_PROTO'] = self._api_protocol
@@ skipping 16 matching lines @@
       self.__exit__(*sys.exc_info())
       raise
 
   def __exit__(self, exc_type, exc_val, exc_tb):
     """Tears down the test run when used as a context manager."""
     self.TearDown()
 
   def _GetAccessToken(self):
     """Generates access token for remote device service."""
     logging.info('Generating remote service access token')
+    remote_device_helper.SetLogging(self._verbose_count, logging.WARNING)

[jbudorick, 2015/01/05 16:52:29]

Could we have remote_device_helper provide this functionality as a context
manager? That way, we'd remove the override even if appurify raises an
exception.

[rnephew (Wrong account), 2015/01/05 19:31:53]

Done, except I moved it to appurify_sanitize because it seems like a better
place for it.

     access_token_results = appurify_sanitized.api.access_token_generate(
         self._api_key, self._api_secret)
+    remote_device_helper.SetLogging(self._verbose_count, logging.NOTSET)
     remote_device_helper.TestHttpResponse(access_token_results,
                                           'Unable to generate access token.')
     self._access_token = access_token_results.json()['response']['access_token']
 
   def _RevokeAccessToken(self):
     """Destroys access token for remote device service."""
     logging.info('Revoking remote service access token')
+    remote_device_helper.SetLogging(self._verbose_count, logging.WARNING)
     revoke_token_results = appurify_sanitized.api.access_token_revoke(
         self._access_token)
+    remote_device_helper.SetLogging(self._verbose_count, logging.NOTSET)
     remote_device_helper.TestHttpResponse(revoke_token_results,
                                           'Unable to revoke access token.')
 
   def _SelectDevice(self):
     """Select which device to use."""
-    logging.info('Finding %s with %s to run tests on.' %
-        (self._remote_device, self._remote_device_os))
+    logging.info('Finding device to run tests on.')
+    remote_device_helper.SetLogging(self._verbose_count, logging.WARNING)
     dev_list_res = appurify_sanitized.api.devices_list(self._access_token)
+    remote_device_helper.SetLogging(self._verbose_count,  logging.NOTSET)
     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['name'] == self._remote_device
-          and device['os_version'] == self._remote_device_os):
+      if device['os_name'] != 'Android':
+        continue
+      if self._remote_device:
+        if device['name'] != self._remote_device:

[jbudorick, 2015/01/05 16:52:29]

Can't this just be

  if self._remote_device and device['name'] != self._remote_device:

?

[rnephew (Wrong account), 2015/01/05 19:31:53]

Done.

+          continue
+      if self._remote_device_os:
+        if device['os_version'] != self._remote_device_os:

[jbudorick, 2015/01/05 16:52:29]

(similar)

[rnephew (Wrong account), 2015/01/05 19:31:53]

Done.

+          continue
+      if device['available_devices_count'] > 0:
+        logging.info('Found device: %s %s' %
+            (device['name'], device['os_version']))
         return device['device_type_id']
     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('  %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: %s %s' %
-        (self._remote_device, self._remote_device_os))
+    raise remote_device_helper.RemoteDeviceError('No device found.')
 
   @property
   def device(self):
     return self._device
 
   @property
   def token(self):
     return self._access_token
 
   @property
   def results_path(self):
     return self._results_path
 
   @property
   def runner_type(self):
     return self._runner_type
 
   @property
   def runner_package(self):
     return self._runner_package
 
   @property
   def trigger(self):
     return self._trigger
 
   @property
   def collect(self):
     return self._collect
+
+  @property
+  def verbose_count(self):
+    return self._verbose_count