Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/build/android/bb_run_sharded_steps.py

Issue 19576005: Revert 212020 "Move Python setup/tear down logic into Forwarder ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/build/android/adb_reverse_forwarder.py ('k') | trunk/src/build/android/pylib/base/base_test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/android/bb_run_sharded_steps.py
===================================================================
--- trunk/src/build/android/bb_run_sharded_steps.py (revision 212053)
+++ trunk/src/build/android/bb_run_sharded_steps.py (working copy)
@@ -165,6 +165,7 @@
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 @@
# 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():
Property changes on: trunk/src/build/android/bb_run_sharded_steps.py
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « trunk/src/build/android/adb_reverse_forwarder.py ('k') | trunk/src/build/android/pylib/base/base_test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698