Adapt python scripts to use the new Forwarder2

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/09/24 10:40:49]

ditto :)
in fact, I think we can remove this, there has been quite a few refactorings
ever since..

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

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.
   """
   ret = []
   for t in test_names:
     has_match = False
     for pattern in pattern_list:
       has_match = has_match or fnmatch.fnmatch(_TestNameToExpectation(t),
                                                pattern)
     if has_match == inclusive:
       ret += [t]
   return ret
 
 
 class TestRunner(BaseTestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
-  _DEVICE_DATA_DIR = constants.TEST_DATA_DIR + '/chrome/test/data'
+  _DEVICE_DATA_DIR = 'chrome/test/data'
   _EMMA_JAR = os.path.join(os.environ.get('ANDROID_BUILD_TOP', ''),
                            'external/emma/lib/emma.jar')
   _COVERAGE_MERGED_FILENAME = 'unittest_coverage.es'
   _COVERAGE_WEB_ROOT_DIR = os.environ.get('EMMA_WEB_ROOTDIR')
   _COVERAGE_FILENAME = 'coverage.ec'
   _COVERAGE_RESULT_PATH = ('/data/data/com.google.android.apps.chrome/files/' +
                            _COVERAGE_FILENAME)
   _COVERAGE_META_INFO_PATH = os.path.join(os.environ.get('ANDROID_BUILD_TOP',
                                                          ''),
                                           'out/target/common/obj/APPS',
@@ skipping 44 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 10 matching lines @@
       self.tests_iter = (BaseTestSharder.tests_container)
     assert self.tests_iter
     return self.tests_iter
 
   def CopyTestFilesOnce(self):
     """Pushes the test data files to the device. Installs the apk if opted."""
     if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):
       logging.warning('Already copied test files to device %s, skipping.',
                       self.device)
       return
-    host_test_files_path = (constants.CHROME_DIR +
-                            '/chrome/test/data/android/device_files')
-    if os.path.exists(host_test_files_path):
-      self.adb.PushIfNeeded(host_test_files_path,
-                            TestRunner._DEVICE_DATA_DIR)
+    host_test_files = [
+        ('android_webview/test/data/device_files', 'webview'),
+        ('content/test/data/android/device_files', 'content'),
+        ('chrome/test/data/android/device_files', 'chrome')
+    ]
+    for (host_src, dst_layer) in host_test_files:
+      host_test_files_path = constants.CHROME_DIR + '/' + host_src
+      if os.path.exists(host_test_files_path):
+        self.adb.PushIfNeeded(host_test_files_path,
+                              self.adb.GetExternalStorage() + '/' +
+                              TestRunner._DEVICE_DATA_DIR + '/' + dst_layer)
     if self.install_apk:
       for apk in self.apks:
         self.adb.ManagedInstall(apk.GetApkPath(),
                                 package_name=apk.GetPackageName())
     self.tool.CopyFiles()
     TestRunner._DEVICE_HAS_TEST_FILES[self.device] = True
 
   def SaveCoverageData(self, test):
     """Saves the Emma coverage data before it's overwritten by the next test.
 
@@ skipping 50 matching lines @@
   def _GetInstrumentationArgs(self):
     ret = {}
     if self.coverage:
       ret['coverage'] = 'true'
     if self.wait_for_debugger:
       ret['debug'] = 'true'
     return ret
 
   def _TakeScreenshot(self, test):
     """Takes a screenshot from the device."""
-    screenshot_tool = os.path.join(os.getenv('ANDROID_HOST_OUT'), 'bin',
-                                   'screenshot2')
+    screenshot_tool = os.path.join(constants.CHROME_DIR,

[bulach, 2012/09/24 10:40:49]

don't quite understand this diff, you probably need to rebaseline your
repository? afaict, this patch has already been applied upstream..

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

yep, sorry
It was some confusion in my git client
It must be ok now

+        'third_party/android_tools/sdk/tools/monkeyrunner')
+    screenshot_script = os.path.join(constants.CHROME_DIR,
+        'build/android/monkeyrunner_screenshot.py')
     screenshot_path = os.path.join(constants.CHROME_DIR,
                                    'out_screenshots')
     if not os.path.exists(screenshot_path):
       os.mkdir(screenshot_path)
     screenshot_name = os.path.join(screenshot_path, test + '.png')
     logging.info('Taking screenshot named %s', screenshot_name)
-    cmd_helper.RunCmd([screenshot_tool, '-s', self.device, screenshot_name])
+    cmd_helper.RunCmd([screenshot_tool, screenshot_script,
+                       '--serial', self.device,
+                       '--file', screenshot_name])
 
   def SetUp(self):
     """Sets up the test harness and device before all tests are run."""
     super(TestRunner, self).SetUp()
     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))
-
+    print "====================================== " + str(self.ports_to_forward)

[bulach, 2012/09/24 10:40:49]

spurious?

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

Done.

+    port_pairs = []
     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.append([(port, port)])
+    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:
+      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/09/24 10:40:49]

:)

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

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