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

Unified Diff: scripts/slave/recipe_modules/chromium_android/api.py

Issue 815213002: Cause chromium_android recipe to consume device_status_check's json. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add missing files Created 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_android/example.expected/basic_builder_basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index b9986b570b108d9ccb6e6ca3eb6e86f327333560..96751e48ff0f704e6214767284a00c3f167bfd96 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -10,6 +10,7 @@ from slave import recipe_api
class AndroidApi(recipe_api.RecipeApi):
def __init__(self, **kwargs):
super(AndroidApi, self).__init__(**kwargs)
+ self._devices = None
def get_config_defaults(self):
return {
@@ -20,6 +21,12 @@ class AndroidApi(recipe_api.RecipeApi):
return self.m.chromium.get_env()
@property
+ def devices(self):
+ assert self._devices is not None,\
+ 'devices is only available after device_status_check()'
+ return self._devices
+
+ @property
def out_path(self):
return self.m.path['checkout'].join('out')
@@ -244,18 +251,41 @@ class AndroidApi(recipe_api.RecipeApi):
skip_wipe=skip_wipe, disable_location=disable_location)
def device_status_check(self, restart_usb=False, **kwargs):
- args = []
+ args = ['--json-output', self.m.json.output()]
if restart_usb:
- args = ['--restart-usb']
+ args += ['--restart-usb']
try:
- self.m.step(
+ result = self.m.step(
'device_status_check',
[self.m.path['checkout'].join('build', 'android', 'buildbot',
'bb_device_status_check.py')] + args,
+ step_test_data=lambda: self.m.json.test_api.output([{
+ "battery": {
+ "status": "5",
+ "scale": "100",
+ "temperature": "249",
+ "level": "100",
+ "AC powered": "false",
+ "health": "2",
+ "voltage": "4286",
+ "Wireless powered": "false",
+ "USB powered": "true",
+ "technology": "Li-ion",
+ "present": "true"
+ },
+ "wifi_ip": "",
+ "imei_slice": "Unknown",
+ "build": "LRX21O",
+ "build_detail":
+ "google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys",
+ "serial": "07a00ca4",
+ "type": "flo"
+ }]),
env=self.m.chromium.get_env(),
infra_step=True,
**kwargs)
+ self._devices = [d['serial'] for d in result.json.output]
except self.m.step.InfraFailure as f:
params = {
'summary': ('Device Offline on %s %s' %
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_android/example.expected/basic_builder_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698