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

Unified Diff: testing/scripts/host_info.py

Issue 2106063006: [Android] Make host_info.py use device_status.py instead of bb_device_status_check.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move constant to common Created 4 years, 5 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 | « testing/scripts/common.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/scripts/host_info.py
diff --git a/testing/scripts/host_info.py b/testing/scripts/host_info.py
index b7da5ab2292fe8641c671d971aad543055cd7e7a..37fa54b4ebdd5f9beb1689a2a9356742c328d3a4 100755
--- a/testing/scripts/host_info.py
+++ b/testing/scripts/host_info.py
@@ -10,7 +10,6 @@ import platform
import subprocess
import sys
-
import common
@@ -61,16 +60,19 @@ def get_device_info(args, failures):
rc = common.run_command([
sys.executable,
os.path.join(args.paths['checkout'],
- 'build',
+ 'third_party',
+ 'catapult',
+ 'devil',
+ 'devil',
'android',
- 'buildbot',
- 'bb_device_status_check.py'),
+ 'tools',
+ 'device_status.py'),
'--json-output', tempfile_path,
'--blacklist-file', os.path.join(
args.paths['checkout'], 'out', 'bad_devices.json')])
if rc:
- failures.append('bb_device_status_check')
+ failures.append('device_status')
return {}
with open(tempfile_path, 'r') as src:
@@ -79,7 +81,8 @@ def get_device_info(args, failures):
results = {}
results['devices'] = sorted(v['serial'] for v in device_info)
- details = [v['build_detail'] for v in device_info if not v['blacklisted']]
+ details = [
+ v['ro.build.fingerprint'] for v in device_info if not v['blacklisted']]
def unique_build_details(index):
return sorted(list(set([v.split(':')[index] for v in details])))
@@ -126,7 +129,9 @@ def main_run(args):
'_host_info': host_info,
}, args.output)
- return len(failures) != 0
+ if len(failures) != 0:
+ return common.INFRA_FAILURE_EXIT_CODE
+ return 0
def main_compile_targets(args):
« no previous file with comments | « testing/scripts/common.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698