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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2267813002: [devil] Add device provisioning logic to devil. (Closed) Base URL: git@github.com:catapult-project/catapult.git@master
Patch Set: Created 4 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
« no previous file with comments | « devil/devil/android/tools/provision_devices.py ('k') | devil/devil/devil_env.py » ('j') | devil/devil/devil_env.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 eb91cdcb9bffd88db4c9ce4b03df510994a5f449..8e462c354469ae50e18f8cb8dac8ddc8f4350d3d 100644
--- a/devil/devil/android/tools/script_common.py
+++ b/devil/devil/android/tools/script_common.py
@@ -8,9 +8,10 @@ from devil.android import device_utils
def GetDevices(requested_devices, blacklist_file):
- blacklist = (device_blacklist.Blacklist(blacklist_file)
- if blacklist_file
- else None)
+ if not isinstance(blacklist_file, device_blacklist.Blacklist):
+ blacklist = (device_blacklist.Blacklist(blacklist_file)
+ if blacklist_file
+ else None)
devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
if not devices:
« no previous file with comments | « devil/devil/android/tools/provision_devices.py ('k') | devil/devil/devil_env.py » ('j') | devil/devil/devil_env.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698