build/android/pylib/utils/test_environment.py - Issue 1281923003: [Android] Add --blacklist-file as a command-line option.

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/utils/test_environment.py

Issue 1281923003: [Android] Add --blacklist-file as a command-line option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« build/android/pylib/device/device_utils.py ('K') | « build/android/pylib/utils/emulator.py ('k') | build/android/screenshot.py » ('j') | tools/telemetry/telemetry/internal/browser/browser_options.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/utils/test_environment.py

diff --git a/build/android/pylib/utils/test_environment.py b/build/android/pylib/utils/test_environment.py

index e78eb5ce801ffa9185fd5c0b69e5f56a7eaef570..c9b56769c2f871c34ca95ba68cc22af0a099fcd2 100644

--- a/build/android/pylib/utils/test_environment.py

+++ b/build/android/pylib/utils/test_environment.py

@@ -30,8 +30,12 @@ def _KillWebServers():

logging.warning('Failed waiting for %s to die. %s', p.pid, e)

-def CleanupLeftoverProcesses():

- """Clean up the test environment, restarting fresh adb and HTTP daemons."""

+def CleanupLeftoverProcesses(devices):

+ """Clean up the test environment, restarting fresh adb and HTTP daemons.

+ Args:

+ devices: The devices to clean.

+ """

_KillWebServers()

device_utils.RestartServer()

@@ -43,5 +47,5 @@ def CleanupLeftoverProcesses():

logging.error(str(e))

d.WaitUntilFullyBooted()

- device_utils.DeviceUtils.parallel().pMap(cleanup_device)

+ device_utils.DeviceUtils.parallel(devices).pMap(cleanup_device)