Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: tools/telemetry/telemetry/internal/forwarders/android_forwarder.py

Issue 1281923003: [Android] Add --blacklist-file as a command-line option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix telemetry_unittests Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/internal/forwarders/android_forwarder.py
diff --git a/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py b/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py
index 7d2f5e2c50f56b07adbe1b74974b5011fc3cc635..61590d91ebc13d6de973bcab072cd31cea87824f 100644
--- a/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py
+++ b/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py
@@ -411,15 +411,19 @@ doit &
"""
my_device = str(self._device)
addresses = []
- for device_serial in android_device.GetDeviceSerials():
- device = device_utils.DeviceUtils(device_serial)
- if device_serial == my_device:
- excluded = excluded_iface
- else:
- excluded = 'no interfaces excluded on other devices'
- addresses += [line.split()[3]
- for line in device.RunShellCommand('ip -o -4 addr')
- if excluded not in line]
+ for device_serial in android_device.GetDeviceSerials(None):
+ try:
+ device = device_utils.DeviceUtils(device_serial)
+ if device_serial == my_device:
+ excluded = excluded_iface
+ else:
+ excluded = 'no interfaces excluded on other devices'
+ addresses += [line.split()[3]
+ for line in device.RunShellCommand('ip -o -4 addr')
+ if excluded not in line]
+ except device_errors.CommandFailedError:
+ logging.warning('Unable to determine IP addresses for %s',
+ device_serial)
return addresses
def _ConfigureNetwork(self, device_iface, host_iface):

Powered by Google App Engine
This is Rietveld 408576698