Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

build/android/pylib/base_test_runner.py

Index: build/android/pylib/base_test_runner.py
diff --git a/build/android/pylib/base_test_runner.py b/build/android/pylib/base_test_runner.py
index a69d0244b603a58e2472cbb47171fbf65f1fa23d..133dc9a3e53a1fad073c3a8b9d58221657a9b8a3 100644
--- a/build/android/pylib/base_test_runner.py
+++ b/build/android/pylib/base_test_runner.py
@@ -70,7 +70,9 @@ class BaseTestRunner(object):
     """Calls subclass functions to set up tests, run them and tear them down.
 
     Returns:
-      Test results returned from RunTests().
+      Test results returned from RunTests(). TODO(tonyg): It looks like

[bulach, 2012/10/15 19:31:55]

I think we should remove this todo (and from downstream as well, I guess this
has been sorted..)

[felipeg, 2012/10/16 14:11:44]

Done.

+      different tests interpret this differently. Some return strings, others
+      bools. We need to solidify this API.
     """
     if not self.HasTests():
       return True
@@ -127,6 +129,7 @@ class BaseTestRunner(object):
     else:
       logging.critical('Failed to start http server')
     self.StartForwarderForHttpServer()
+    return (self._forwarder_device_port, self._http_server.port)
 
   def StartForwarder(self, port_pairs):
     """Starts TCP traffic forwarding for the given |port_pairs|.
@@ -134,10 +137,6 @@ class BaseTestRunner(object):
     Args:
       host_port_pairs: A list of (device_port, local_port) tuples to forward.
     """
-    # Sometimes the forwarder device port may be already used. We have to kill
-    # all forwarder processes to ensure that the forwarder can be started since
-    # currently we can not associate the specified port to related pid.
-    self.adb.KillAll('forwarder')
     if self._forwarder:
       self._forwarder.Close()
     self._forwarder = Forwarder(
@@ -168,7 +167,7 @@ class BaseTestRunner(object):
     if self._forwarder or self._spawner_forwarder:
       # Kill all forwarders on the device and then kill the process on the host
       # (if it exists)
-      self.adb.KillAll('forwarder')
+      self.adb.KillAll('device_forwarder')
       if self._forwarder:
         self._forwarder.Close()
       if self._spawner_forwarder: