Increase Android test robustness.

build/android/single_test_runner.py

 # Copyright (c) 2011 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 logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
@@ skipping 13 matching lines @@
     timeout: Timeout for each test.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     dump_debug_info: Whether or not to dump debug information.
   """
 
   def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
                rebaseline, performance_test, cleanup_test_files, tool,
-               dump_debug_info=False):
+               dump_debug_info=False,
+               fast_and_loose=False):
     BaseTestRunner.__init__(self, device)
     self._running_on_emulator = self.device.startswith('emulator')
     self._gtest_filter = gtest_filter
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device,
            os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
+    self.fast_and_loose = fast_and_loose
 
     self.test_package = TestPackageExecutable(self.adb, device,
         test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
         tool, self.dump_debug_info)
 
   def _GetHttpServerDocumentRootForTestSuite(self):
     """Returns the document root needed by the test suite."""
     if self.test_package.test_suite_basename == 'page_cycler_tests':
       return os.path.join(run_tests_helper.CHROME_DIR, 'data', 'page_cycler')
     return None
@@ skipping 143 matching lines @@
     if document_root:
       self.LaunchTestHttpServer(document_root)
     if self._TestSuiteRequiresMockTestServer():
       self.LaunchChromeTestServerSpawner()
 
   def StripAndCopyFiles(self):
     """Strips and copies the required data files for the test suite."""
     self.test_package.StripAndCopyExecutable()
     self.test_package.tool.CopyFiles()
     test_data = self.GetDataFilesForTestSuite()
-    if test_data:
+    if test_data and not self.fast_and_loose:
       if self.test_package.test_suite_basename == 'page_cycler_tests':
         # Since the test data for page cycler are huge (around 200M), we use
         # sdcard to store the data and create symbol links to map them to
         # data/local/tmp/ later.
         self.CopyTestData(test_data, '/sdcard/')
         for p in [os.path.dirname(d) for d in test_data if os.path.isdir(d)]:
           mapped_device_path = '/data/local/tmp/' + p
           # Unlink the mapped_device_path at first in case it was mapped to
           # a wrong path. Add option '-r' becuase the old path could be a dir.
           self.adb.RunShellCommand('rm -r %s' %  mapped_device_path)
@@ skipping 86 matching lines @@
 
     Returns:
       A TestResults object.
     """
     self.SetUp()
     try:
       self._RunTestsForSuiteInternal()
     finally:
       self.TearDown()
     return self.test_results