Support HTTP test-server based net unit tests on Android.

build/android/pylib/base_test_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
@@ skipping 64 matching lines @@
     if not self.HasTests():
       return True
     self.SetUp()
     try:
       return self.RunTests()
     finally:
       self.TearDown()
 
   def SetUp(self):
     """Called before tests run."""
-    pass
+    Forwarder.KillDevice(self.adb)
 
   def HasTests(self):
     """Whether the test suite has tests to run."""
     return True
 
   def RunTests(self):
     """Runs the tests. Need to be overridden."""
     raise NotImplementedError
 
   def TearDown(self):
@@ skipping 26 matching lines @@
     self._http_server = lighttpd_server.LighttpdServer(
         document_root, port=port, extra_config_contents=extra_config_contents)
     if self._http_server.StartupHttpServer():
       logging.info('http server started: http://localhost:%s',
                    self._http_server.port)
     else:
       logging.critical('Failed to start http server')
     self.StartForwarderForHttpServer()
     return (self._forwarder_device_port, self._http_server.port)
 
+  def _CreateAndRunForwarder(
+      self, adb, port_pairs, tool, host_name, build_type):
+    """Creates and run a forwarder."""
+    forwarder = Forwarder(adb, build_type)
+    forwarder.Run(port_pairs, tool, host_name)
+    return forwarder
+
   def StartForwarder(self, port_pairs):
     """Starts TCP traffic forwarding for the given |port_pairs|.
 
     Args:
       host_port_pairs: A list of (device_port, local_port) tuples to forward.
     """
     if self._forwarder:
       self._forwarder.Close()
-    self._forwarder = Forwarder(
+    self._forwarder = self._CreateAndRunForwarder(
         self.adb, port_pairs, self.tool, '127.0.0.1', self.build_type)
 
   def StartForwarderForHttpServer(self):
     """Starts a forwarder for the HTTP server.
 
     The forwarder forwards HTTP requests and responses between host and device.
     """
     self.StartForwarder([(self._forwarder_device_port, self._http_server.port)])
 
   def RestartHttpServerForwarderIfNecessary(self):
     """Restarts the forwarder if it's not open."""
     # Checks to see if the http server port is being used.  If not forwards the
     # request.
     # TODO(dtrainor): This is not always reliable because sometimes the port
     # will be left open even after the forwarder has been killed.
     if not ports.IsDevicePortUsed(self.adb,
         self._forwarder_device_port):
       self.StartForwarderForHttpServer()
 
   def ShutdownHelperToolsForTestSuite(self):
     """Shuts down the server and the forwarder."""
     # Forwarders should be killed before the actual servers they're forwarding
     # to as they are clients potentially with open connections and to allow for
     # proper hand-shake/shutdown.
-    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('device_forwarder')
-      if self._forwarder:
-        self._forwarder.Close()
-      if self._spawner_forwarder:
-        self._spawner_forwarder.Close()
+    Forwarder.KillDevice(self.adb)
     if self._http_server:
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
     self.flags.Restore()
 
   def LaunchChromeTestServerSpawner(self):
     """Launches test server spawner."""
     server_ready = False
     error_msgs = []
@@ skipping 14 matching lines @@
         break
       else:
         error_msgs.append(error_msg)
       self._spawning_server.Stop()
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()
-    self._spawner_forwarder = Forwarder(
+    self._spawner_forwarder = self._CreateAndRunForwarder(
         self.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)