build/android/pylib/screenshot.py - Issue 1079113002: [Android] Add a "quiet" flag so KillAll doesn't complain if no processes killed

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/pylib/screenshot.py

Issue 1079113002: [Android] Add a "quiet" flag so KillAll doesn't complain if no processes killed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typo Created 5 years, 8 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/pylib/gtest/test_package_exe.py ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/screenshot.py

diff --git a/build/android/pylib/screenshot.py b/build/android/pylib/screenshot.py

index ea939b704ce6fd51fc0f70aac82a86af46cb66f2..7e122126987f89fd5050a2d9f5494f0d20ff487b 100644

--- a/build/android/pylib/screenshot.py

+++ b/build/android/pylib/screenshot.py

@@ -4,10 +4,10 @@

import logging

import os

-import signal

import tempfile

from pylib import cmd_helper

+from pylib import device_signal

from pylib.device import device_errors

# TODO(jbudorick) Remove once telemetry gets switched over.

@@ -73,9 +73,8 @@ class VideoRecorder(object):

self._is_started = False

if not self._recorder:

return

- try:

- self._device.KillAll('screenrecord', signum=signal.SIGINT)

- except device_errors.CommandFailedError:

+ if not self._device.KillAll('screenrecord', signum=device_signal.SIGINT,

+ quiet=True):

logging.warning('Nothing to kill: screenrecord was not running')

self._recorder.wait()