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

Unified Diff: build/android/device_status_check.py

Issue 16110005: Track install speed on devices and fail device status step on low battery. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move check install into device status check and fail on low battery. Created 7 years, 7 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 | « build/android/buildbot/bb_device_steps.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/device_status_check.py
diff --git a/build/android/device_status_check.py b/build/android/device_status_check.py
index 15ab4938e6d45fc81f669e1b8f04395e553e0779..47a63a0969a757bd75a25f25de5ba45c563c0470 100755
--- a/build/android/device_status_check.py
+++ b/build/android/device_status_check.py
@@ -24,7 +24,8 @@ def DeviceInfo(serial):
serial: The serial of the attached device to construct info about.
Returns:
- Tuple of device type, build id and report as a string.
+ Tuple of device type, build id, report as a string, error messages, and
+ boolean indicating whether or not device can be used for testing.
"""
def AdbShellCmd(cmd):
@@ -38,6 +39,13 @@ def DeviceInfo(serial):
setup_wizard_disabled = AdbShellCmd(
'getprop ro.setupwizard.mode') == 'DISABLED'
battery = AdbShellCmd('dumpsys battery')
+ install_output = GetCmdOutput(['build/android/adb_install_apk.py', '--apk',
+ 'build/android/CheckInstallApk-debug.apk'])
+ install_speed_found = re.findall('(\d+) KB/s', install_output)
+ if install_speed_found:
+ install_speed = int(install_speed_found[0])
+ else:
+ install_speed = 'Unknown'
if 'Error' in battery:
ac_power = 'Unknown'
battery_level = 'Unknown'
@@ -55,17 +63,26 @@ def DeviceInfo(serial):
'| grep Device'
"| awk '{print $4}'")[-6:],
' Wifi IP: %s' % AdbShellCmd('getprop dhcp.wlan0.ipaddress'),
+ ' Install Speed: %s KB/s' % install_speed,
'']
errors = []
if battery_level < 5:
- errors += ['Device critically low in battery.']
+ errors += ['Device critically low in battery. Do not use for testing.']
if not setup_wizard_disabled:
errors += ['Setup wizard not disabled. Was it provisioned correctly?']
if device_product_name == 'mantaray' and ac_power != 'true':
errors += ['Mantaray device not connected to AC power.']
+ if install_speed < 800:
+ errors += ['Device install speed too low. Do not use for testing.']
- return device_type, device_build, '\n'.join(report), errors
+ # TODO(navabi): Determine if device status check step should fail on slow
+ # install speed. The original CL caused the step to fail but was reverted
+ # because it caused too many early failures. Determine if it was just flake.
+ # Also, do not fail on 'Unknown' caused by offline device, because other
+ # devices can still be used for tests.
+ fail_step = (battery_level == 'Unknown' or battery_level >= 5)
+ return device_type, device_build, '\n'.join(report), errors, fail_step
def CheckForMissingDevices(options, adb_online_devs):
@@ -167,7 +184,8 @@ def main():
devices = android_commands.GetAttachedDevices()
types, builds, reports, errors = [], [], [], []
if devices:
- types, builds, reports, errors = zip(*[DeviceInfo(dev) for dev in devices])
+ types, builds, reports, errors, fail_step_lst = zip(*[DeviceInfo(dev)
+ for dev in devices])
err_msg = CheckForMissingDevices(options, devices) or []
@@ -189,6 +207,12 @@ def main():
print msg
SendDeviceStatusAlert(msg)
+ if False in fail_step_lst:
+ # TODO(navabi): Build fails on device status check step if there exists any
+ # devices with critically low battery or install speed. Remove those devices
+ # from testing, allowing build to continue with good devices.
+ return 1
+
if not devices:
return 1
« no previous file with comments | « build/android/buildbot/bb_device_steps.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698