summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikecase <mikecase@chromium.org>2015-07-23 15:59:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-23 23:00:46 +0000
commitaaa50f5028c9139e3dfa7de3833a35d2918496b4 (patch)
treecdd8ee09e048a8ef3f40403405ac95e44df4da5e
parent8d3e2ce2dbf5b21d6ab7778b1db3e9bdfd8f9cc3 (diff)
downloadchromium_src-aaa50f5028c9139e3dfa7de3833a35d2918496b4.zip
chromium_src-aaa50f5028c9139e3dfa7de3833a35d2918496b4.tar.gz
chromium_src-aaa50f5028c9139e3dfa7de3833a35d2918496b4.tar.bz2
Revert of [Android] Add device_list_status entry to the output json for device status check. (patchset #3 id:40001 of https://codereview.chromium.org/1247823002/)
Reason for revert: Syntax error. Original issue's description: > [Android] Add device_list_status entry to the output json for device status check. > > Adding a new entry to the output json for device status check. This > output will be used in the infra recipes to output warning if > devices are missing or unexpected devices are found on the bots. > > BUG= > > Committed: https://crrev.com/a94ba0c0b0010f63e492d9f4302fa9b909f8f6ce > Cr-Commit-Position: refs/heads/master@{#340143} TBR=jbudorick@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/1256683003 Cr-Commit-Position: refs/heads/master@{#340200}
-rwxr-xr-xbuild/android/buildbot/bb_device_status_check.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
index 84a0c98..917c51e 100755
--- a/build/android/buildbot/bb_device_status_check.py
+++ b/build/android/buildbot/bb_device_status_check.py
@@ -321,12 +321,6 @@ def main():
types, builds, batteries, errors, devices_ok, json_data = (
zip(*[DeviceInfo(dev, options) for dev in devices]))
- for j in json_data:
- if j.get('serial') not in expected_devices:
- j['device_list_error'] = 'unexpected device'
- for d in expected_devices:
- if d not in device_serials:
- json_data.append({'serial': d, 'device_list_error': 'missing device'})
# Write device info to file for buildbot info display.
if os.path.exists('/home/chrome-bot'):
with open('/home/chrome-bot/.adb_device_info', 'w') as f: