build/android/bb_run_sharded_steps.py - Issue 19844006: Revert "Reland r212020: Move Python setup/tear down logic into Forwarder ..."

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/bb_run_sharded_steps.py

Issue 19844006: Revert "Reland r212020: Move Python setup/tear down logic into Forwarder ..." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: build/android/bb_run_sharded_steps.py

diff --git a/build/android/bb_run_sharded_steps.py b/build/android/bb_run_sharded_steps.py

index 9b768a9f7e6214934b46483b365583efadef4101..afd354a32e2e916857c28e642d5d4409178849dd 100755

--- a/build/android/bb_run_sharded_steps.py

+++ b/build/android/bb_run_sharded_steps.py

@@ -165,6 +165,7 @@ def _PrintAllStepsOutput(steps):

def _KillPendingServers():

for retry in range(5):

+ forwarder.Forwarder.KillHost()

for server in ['lighttpd', 'web-page-replay']:

pids = cmd_helper.GetCmdOutput(['pgrep', '-f', server])

pids = [pid.strip() for pid in pids.split('\n') if pid.strip()]

@@ -200,8 +201,6 @@ def main(argv):

# previous runs.

_KillPendingServers()

- forwarder.Forwarder.UseMultiprocessing()

# Reset the test port allocation. It's important to do it before starting

# to dispatch any step.

if not ports.ResetTestServerPortAllocation():

« no previous file with comments | « build/android/adb_reverse_forwarder.py ('k') | build/android/pylib/base/base_test_runner.py » ('j') | no next file with comments »