[Android] Remove more uses of android_commands from build/android/pylib.

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index c54ed28d324054eae3c5aee72aa1442d80bf1f36..7e7f9bb9113a67002191c1c8e0a6653a9e413d76 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -16,7 +16,6 @@ import sys
 import threading
 import unittest
 
-from pylib import android_commands
 from pylib import constants
 from pylib import forwarder
 from pylib import ports
@@ -25,6 +24,8 @@ from pylib.base import environment_factory
 from pylib.base import test_dispatcher
 from pylib.base import test_instance_factory
 from pylib.base import test_run_factory
+from pylib.device import device_errors
+from pylib.device import device_utils
 from pylib.gtest import gtest_config
 from pylib.gtest import setup as gtest_setup
 from pylib.gtest import test_options as gtest_test_options
@@ -867,18 +868,21 @@ def _GetAttachedDevices(test_device=None):
   Returns:
     A list of attached devices.
   """
-  attached_devices = []
-
-  attached_devices = android_commands.GetAttachedDevices()
+  attached_devices = device_utils.DeviceUtils.HealthyDevices()
   if test_device:
-    assert test_device in attached_devices, (
-        'Did not find device %s among attached device. Attached devices: %s'
-        % (test_device, ', '.join(attached_devices)))
-    attached_devices = [test_device]
+    for d in attached_devices:
+      if test_device == d.adb.GetDeviceSerial():
+        attached_devices = [d]
+        break
+    else:
+      raise device_errors.DeviceUnreachableError(
+          'Did not find device %s among attached device. Attached devices: %s'
+          % (test_device, ', '.join(attached_devices)))

[perezju, 2015/04/28 10:33:51]

Hmm... Just a thought. By virtue of our definitions of __eq__ and __str__ in
AdbWrapper, an adb_wrapper instance also behaves as it's own string serial when
appropriate, so all of the following tests do work as expected:

- str_serial == adb_instance
- adb_instance == str_serial
- adb_instance_1 == adb_instance_2
- str_serial in list_of_adb_instances
- adb_instance in list_of_str_serials

We may want to do something similar for DeviceUtils (basically adding an __eq__
that compares with str of other), so the inner block here could just become:

if test_device in attached_devices:
  attached_devices = [device_utils.DeviceUtils(test_device)]
else:
  raise ...

wdyt?

[jbudorick, 2015/04/28 13:44:59]

I implemented __eq__ to support this behavior, but it winds up a little weird...
in order to get the 'serial in list_of_devices' functionality, we have to
compare a basestring and a DeviceUtils for equality.

I wound up implementing the part in here a little differently.

[perezju, 2015/04/28 14:36:19]

I think that should "just work". I did a bit of testing and when doing
string_serial == device (or when doing string_serial in [device]) this is
eventually turned into device.__eq__(string_serial).

From what I gather from the documentation: if the lhs of the equality is a
built-in, and the rhs is a class; the __eq__ of the class is tried first.
https://docs.python.org/2/reference/datamodel.html#coercion-rules

 
-  assert attached_devices, 'No devices attached.'
+  if not attached_devices:
+    raise device_errors.NoDevicesError()
 
-  return sorted(attached_devices)
+  return sorted(attached_devices, key=lambda d: d.adb.GetDeviceSerial())

[perezju, 2015/04/28 10:33:51]

... and if we define __lt__, we also get |sorted| working out of the box.

[jbudorick, 2015/04/28 13:44:59]

Done.

 
 
 def RunTestsCommand(args, parser):