build/android/buildbot/bb_device_status_check.py - Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/buildbot/bb_device_status_check.py

Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 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:

Index: build/android/buildbot/bb_device_status_check.py

diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py

index 2eb3626a9d3ca9b13bb8a57a81979da2df9b053e..6d736a146baa7a26e398b7f81ec526785a4deff5 100755

--- a/build/android/buildbot/bb_device_status_check.py

+++ b/build/android/buildbot/bb_device_status_check.py

@@ -252,7 +252,7 @@ def KillAllAdb():

try:

if 'adb' in p.name:

yield p

- except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):

+ except (psutil.NoSuchProcess, psutil.AccessDenied):

pass

for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:

@@ -261,12 +261,12 @@ def KillAllAdb():

print 'kill %d %d (%s [%s])' % (sig, p.pid, p.name,

' '.join(p.cmdline))

p.send_signal(sig)

- except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):

+ except (psutil.NoSuchProcess, psutil.AccessDenied):

pass

for p in GetAllAdb():

try:

print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))

- except (psutil.error.NoSuchProcess, psutil.error.AccessDenied):

+ except (psutil.NoSuchProcess, psutil.AccessDenied):

pass

« no previous file with comments | « build/android/buildbot/OWNERS ('k') | build/android/buildbot/bb_device_steps.py » ('j') | no next file with comments »