Android: Enable a bunch of InProcessBrowserLayoutTests.

build/android/pylib/gtest/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 glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 113 matching lines @@
   elif test_suite_basename == 'perf_tests':
     return [
       'base/test/data',
     ]
   elif test_suite_basename == 'content_browsertests':
     return [
       'content/test/data',
     ]
   return []
 
+def _GetOptionalDataFilesForTestSuite(test_suite_basename):

[Yaron, 2013/04/02 01:54:43]

Why are these optional? Why might they not exist? Are they not always checked
out? This seems a bit too indeterminate and could lead to hard to diagnose
failures.

[nilesh, 2013/04/02 17:04:01]

On the svn workflow these directories do not exist (i.e. on the bots, the data
is in content/test/data). For git checkouts we need to push these
directories instead. The code checks for the data in content/test/data first and
then in "third_party/WebKit/LayoutTests" 
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/com...
https://code.google.com/p/chromium/issues/detail?id=105104

Added bug reference in a comment.

+  """Returns a list of data files/dirs that are pushed if present.
+
+  Args:
+    test_suite_basename: The test suite basename for which to return file paths.
+
+  Returns:
+    A list of test file and directory paths.
+  """
+  if test_suite_basename == 'content_browsertests':

[Yaron, 2013/04/02 01:54:43]

How much data does this end up copying?

[nilesh, 2013/04/02 17:04:01]

less than 50MB (but only when someone is trying to run content_browsertests
locally). These do not exist on the bots.

+    return [
+      'third_party/WebKit/LayoutTests/fast/events',
+      'third_party/WebKit/LayoutTests/fast/files',
+      'third_party/WebKit/LayoutTests/fast/filesystem',
+      'third_party/WebKit/LayoutTests/fast/js/resources',
+      'third_party/WebKit/LayoutTests/fast/workers',
+      'third_party/WebKit/LayoutTests/http/tests',
+      'third_party/WebKit/LayoutTests/media',
+      'third_party/WebKit/LayoutTests/storage/indexeddb',
+    ]
+  return []
+
 
 def _TestSuiteRequiresMockTestServer(test_suite_basename):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                    'content_unittests',
                                    'content_browsertests']
   return (test_suite_basename in
           tests_require_net_test_server)
 
 
@@ skipping 52 matching lines @@
 
 
   def StripAndCopyFiles(self):
     """Strips and copies the required data files for the test suite."""
     self.test_package.StripAndCopyExecutable()
     self.test_package.PushDataAndPakFiles()
     self.tool.CopyFiles()
     test_data = _GetDataFilesForTestSuite(self.test_package.test_suite_basename)
     if test_data:
       # Make sure SD card is ready.
       self.adb.WaitForSdCardReady(20)

[Yaron, 2013/04/02 01:54:43]

Maybe you should also be waiting for sd card to be ready? Are you guaranteeing
that anyone with optional data would have mandatory data?

[nilesh, 2013/04/02 17:04:01]

Done.

       for data in test_data:
         self.CopyTestData([data], self.adb.GetExternalStorage())
+    optional_test_data = _GetOptionalDataFilesForTestSuite(
+        self.test_package.test_suite_basename)
+    if optional_test_data:
+      for data in optional_test_data:
+        if os.path.exists(data):

[Yaron, 2013/04/02 01:54:43]

At least output what paths are being skipped, if any

[nilesh, 2013/04/02 17:04:01]

These will always be ignored on the bots.

+          self.CopyTestData([data], self.adb.GetExternalStorage())
     if self.test_package.test_suite_basename == 'webkit_unit_tests':
       self.PushWebKitUnitTestsData()
 
   def PushWebKitUnitTestsData(self):
     """Pushes the webkit_unit_tests data files to the device.
 
     The path of this directory is different when the suite is being run as
     part of a WebKit check-out.
     """
     webkit_src = os.path.join(constants.CHROME_DIR, 'third_party', 'WebKit')
@@ skipping 61 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()