[Android] Add support for layering device-located test files.

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
 import shutil
 import sys
+import tempfile
 import time
 
 import android_commands
 import apk_info
 from base_test_runner import BaseTestRunner
 from base_test_sharder import BaseTestSharder, SetTestsContainer
 import cmd_helper
 import constants
 import errors
 from forwarder import Forwarder
@@ skipping 132 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_paths = [
+        constants.CHROME_DIR + '/android_webview/test/data/device_files',
+        constants.CHROME_DIR + '/content/test/data/android/device_files',
+        constants.CHROME_DIR + '/chrome/test/data/android/device_files'
+    ]
+    try:
+      temp_dir = tempfile.mkdtemp()
+      for src_dir in host_test_files_paths:
+        # shutil.copytree requires the destination directory not to exist,
+        # thus it can't be used for directory merges.
+        if os.path.exists(src_dir):
+          cmd_helper.RunCmd(['cp', '-r', src_dir, temp_dir])

[bulach, 2012/09/11 10:35:06]

hmm.. how many tests do we have versus how many files this would copy over time?
:)
it'd probably be simpler to fix the (few) tests, and then from now on we'd read
from the right place?

I mean, there could be conflicts in files with the same name but different data,
plus we'd be doing this copy every time we're running the tests, etc.. I don't
think we have that many tests that would need fixing, and then we can avoid any
future problem.. :) what do you think?

[mnaganov (inactive), 2012/09/11 16:45:03]

OK, changed to avoid merging -- looks simpler. This requires a bit of downstream
changes, also sending them to you.

+      temp_files_dir = os.path.join(temp_dir, 'device_files')
+      if os.path.exists(temp_files_dir):
+        self.adb.PushIfNeeded(temp_files_dir,
+                              TestRunner._DEVICE_DATA_DIR)
+    finally:
+      shutil.rmtree(temp_dir)
     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 397 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