Adapt python scripts to use the new Forwarder2

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
 
 import android_commands
 import constants
 from chrome_test_server_spawner import SpawningServer
 import constants
 from flag_changer import FlagChanger
 from forwarder import Forwarder
 import lighttpd_server
 import ports
 from valgrind_tools import CreateTool
 
 
 # A file on device to store ports of net test server. The format of the file is
 # test-spawner-server-port:test-server-port
-NET_TEST_SERVER_PORT_INFO_FILE = \
-  constants.TEST_DATA_DIR + '/net-test-server-ports'
+NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device.
 
   A subclass should implement RunTests() with no parameter, so that calling
   the Run() method will set up tests, run them and tear them down.
   """
 
   def __init__(self, device, tool, shard_index, build_type):
@@ skipping 18 matching lines @@
     self._spawner_forwarder = None
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
     self.build_type = build_type
 
   def _PushTestServerPortInfoToDevice(self):
     """Pushes the latest port information to device."""
-    self.adb.SetFileContents(NET_TEST_SERVER_PORT_INFO_FILE,
+    self.adb.SetFileContents(self.adb.GetExternalStorage() + '/' +
+                             NET_TEST_SERVER_PORT_INFO_FILE,
                              '%d:%d' % (self.test_server_spawner_port,
                                         self.test_server_port))
 
   def Run(self):
     """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/09/24 10:40:49]

a bit unfair to add somone else's todo :) feel free to put my name on it.

[felipeg, 2012/09/25 03:27:21]

Sorry
this was a spurious diff that I copied from downstream.

+      different tests interpret this differently. Some return strings, others
+      bools. We need to solidify this API.
     """
     if not self.HasTests():
       return True
     self.SetUp()
     try:
       return self.RunTests()
     finally:
       self.TearDown()
 
   def SetUp(self):
@@ skipping 46 matching lines @@
 
   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.
     """
     # 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')
+    self.adb.KillAll('device_forwarder')
     if self._forwarder:
       self._forwarder.Close()
     self._forwarder = Forwarder(
         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.
     """
@@ skipping 10 matching lines @@
       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('forwarder')
+      self.adb.KillAll('device_forwarder')
       if self._forwarder:
         self._forwarder.Close()
       if self._spawner_forwarder:
         self._spawner_forwarder.Close()
     if self._http_server:
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
     self.flags.Restore()
 
@@ skipping 22 matching lines @@
       # 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.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)