devil/devil/android/tools/script_common.py - Issue 2587493002: devil: Make provision_devices.py complain when no devices are available.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: devil/devil/android/tools/script_common.py

Issue 2587493002: devil: Make provision_devices.py complain when no devices are available. (Closed)

Patch Set: comments Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: devil/devil/android/tools/script_common.py

diff --git a/devil/devil/android/tools/script_common.py b/devil/devil/android/tools/script_common.py

index 8e462c354469ae50e18f8cb8dac8ddc8f4350d3d..f91ad5eea0b41386f3fb64d11169092af216fed1 100644

--- a/devil/devil/android/tools/script_common.py

+++ b/devil/devil/android/tools/script_common.py

@@ -9,11 +9,11 @@ from devil.android import device_utils

def GetDevices(requested_devices, blacklist_file):

if not isinstance(blacklist_file, device_blacklist.Blacklist):

- blacklist = (device_blacklist.Blacklist(blacklist_file)

- if blacklist_file

- else None)

+ blacklist_file = (device_blacklist.Blacklist(blacklist_file)

+ if blacklist_file

+ else None)

- devices = device_utils.DeviceUtils.HealthyDevices(blacklist)

+ devices = device_utils.DeviceUtils.HealthyDevices(blacklist_file)

if not devices:

raise device_errors.NoDevicesError()

elif requested_devices:

« no previous file with comments | « devil/devil/android/tools/provision_devices.py ('k') | no next file » | no next file with comments »