Android: Enable a bunch of InProcessBrowserLayoutTests.

build/android/pylib/gtest/test_runner.py

Index: build/android/pylib/gtest/test_runner.py
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 1be28a204fbfa6558db449c2d8679a7a91e2fb15..b6edbb01d70f48ae3902bf5884669d7d2e7c2669 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -131,6 +131,28 @@ def _GetDataFilesForTestSuite(test_suite_basename):
     ]
   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."""
@@ -206,6 +228,12 @@ class TestRunner(base_test_runner.BaseTestRunner):
       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()