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

build/android/pylib/run_java_tests.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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import fnmatch
 import logging
 import os
 import re
@@ skipping 22 matching lines @@
   """A fatal test exception."""
   pass
 
 
 def _TestNameToExpectation(test_name):
   # A test name is a Package.Path.Class#testName; convert to what we use in
   # the expectation file.
   return '.'.join(test_name.replace('#', '.').split('.')[-2:])
 
 
+# TODO(jaydeepmehta): FilterTests should be moved to a common file for

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

ditto..

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

Done.

+# all integration tests.
 def FilterTests(test_names, pattern_list, inclusive):
   """Filters |test_names| using a list of patterns.
 
   Args:
     test_names: A list of test names.
     pattern_list: A list of patterns.
     inclusive: If True, returns the tests that match any pattern. if False,
                returns the tests that do not match any pattern.
   Returns:
     A list of test names.
@@ skipping 70 matching lines @@
     self.wait_for_debugger = options.wait_for_debugger
 
     self.tests_iter = tests_iter
     self.coverage = coverage
     self.apks = apks
     self.test_apk = apks[0]
     self.instrumentation_class_path = self.test_apk.GetPackageName()
     self.ports_to_forward = ports_to_forward
 
     self.test_results = TestResults()
-    # List of forwarders created by this instance of TestRunner.
-    self.forwarders = []
+    self.forwarder = None
 
     if self.coverage:
       if os.path.exists(TestRunner._COVERAGE_MERGED_FILENAME):
         os.remove(TestRunner._COVERAGE_MERGED_FILENAME)
       if not os.path.exists(TestRunner._COVERAGE_META_INFO_PATH):
         raise FatalTestException('FATAL ERROR in ' + sys.argv[0] +
                                  ' : Coverage meta info [' +
                                  TestRunner._COVERAGE_META_INFO_PATH +
                                  '] does not exist.')
       if (not TestRunner._COVERAGE_WEB_ROOT_DIR or
@@ skipping 118 matching lines @@
     if not self.adb.IsRootEnabled():
       logging.warning('Unable to enable java asserts for %s, non rooted device',
                       self.device)
     else:
       if self.adb.SetJavaAssertsEnabled(enable=True):
         self.adb.Reboot(full_reboot=False)
 
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
-    # This line *must* come before the forwarding below, as it nukes all
-    # the other forwarders. A more comprehensive fix might be to pull the
-    # forwarder-killing line up to here, but that might violate assumptions
-    # implicit in other places.
-    self.LaunchTestHttpServer(os.path.join(constants.CHROME_DIR),
-                              (constants.LIGHTTPD_RANDOM_PORT_FIRST +
-                               self.shard_index))
-
+    http_server_ports = self.LaunchTestHttpServer(
+        os.path.join(constants.CHROME_DIR),
+        (constants.LIGHTTPD_RANDOM_PORT_FIRST + self.shard_index))
     if self.ports_to_forward:
-      for port in self.ports_to_forward:
-        self.forwarders.append(Forwarder(
-            self.adb, [(port, port)], self.tool, '127.0.0.1', self.build_type))
+      port_pairs = [(port, port) for port in self.ports_to_forward]
+      # We need to remember which ports the HTTP server is using, since the
+      # forwarder will stomp on them otherwise.
+      port_pairs.append(http_server_ports)
+      self.forwarder = Forwarder(
+         self.adb, port_pairs, self.tool, '127.0.0.1', self.build_type)
     self.CopyTestFilesOnce()
     self.flags.AddFlags(['--enable-test-intents'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
-    if self.forwarders:
-      for forwarder in self.forwarders:
-        forwarder.Close()
+    if self.forwarder:
+      self.forwarder.Close()
     self.GenerateCoverageReportIfNeeded()
     super(TestRunner, self).TearDown()
 
   def TestSetup(self, test):
     """Sets up the test harness for running a particular test.
 
     Args:
       test: The name of the test that will be run.
     """
     self.SetupPerfMonitoringIfNeeded(test)
@@ skipping 53 matching lines @@
     Args:
       test: The name of the test that was just run.
     Raises:
       FatalTestException: if there's anything wrong with the perf data.
     """
     if not self._IsPerfTest(test):
       return
     raw_test_name = test.split('#')[1]
 
     # Wait and grab annotation data so we can figure out which traces to parse
+    # TODO(tonyg): Is there an error log line to watch for here?

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

ditto..

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

Done.

     regex = self.adb.WaitForLogMatch(re.compile('\*\*PERFANNOTATION\(' +
                                                 raw_test_name +
                                                 '\)\:(.*)'), None)
 
     # If the test is set to run on a specific device type only (IE: only
     # tablet or phone) and it is being run on the wrong device, the test
     # just quits and does not do anything.  The java test harness will still
     # print the appropriate annotation for us, but will add --NORUN-- for
     # us so we know to ignore the results.
     # The --NORUN-- tag is managed by MainActivityTestBase.java
@@ skipping 211 matching lines @@
 
   logging.info('Will run: %s', str(tests))
 
   if len(attached_devices) > 1 and (coverage or options.wait_for_debugger):
     logging.warning('Coverage / debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   sharder = TestSharder(attached_devices, options, tests, apks)
   test_results = sharder.RunShardedTests()
   return test_results