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

Unified Diff: appengine/swarming/swarming_bot/api/platforms/android.py

Issue 2405613002: swarming: Enable USB resets in python-adb on the staging instance. (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/swarming_bot/api/platforms/android.py
diff --git a/appengine/swarming/swarming_bot/api/platforms/android.py b/appengine/swarming/swarming_bot/api/platforms/android.py
index 9132d7dcddda7f68809b69d3fd71752d0f9479a8..da3c1f7072e61ba8a1741b809ba5d5b4c8aa9e27 100644
--- a/appengine/swarming/swarming_bot/api/platforms/android.py
+++ b/appengine/swarming/swarming_bot/api/platforms/android.py
@@ -109,9 +109,12 @@ def initialize(pub_key, priv_key):
def get_devices(bot, endpoints=None):
devices = []
if not gce.is_gce():
+ # TODO(bpastene) Remove this check and all associated logic after
+ # experiment from crbug.com/642440 is complete.
+ enable_resets = bot.server and '-dev' in bot.server
bpastene 2016/10/07 22:57:58 Anyone know a better is_staging check?
ghost stip (do not use) 2016/10/07 23:50:26 IIRC this is correct but double-check with maruel
M-A Ruel 2016/10/11 19:34:02 Make it a flag, use bot_config.is_staging() to pas
bpastene 2016/10/11 20:09:53 Done: https://chromereviews.googleplex.com/5194470
devices += high.GetLocalDevices(
'swarming', 10000, 10000, on_error=bot.post_error if bot else None,
- as_root=False)
+ as_root=False, enable_resets=enable_resets)
if endpoints:
devices += high.GetRemoteDevices(
« no previous file with comments | « no previous file | appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698