Upstream remaining differences in android/build python files

build/android/pylib/single_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
 import sys
 
 from base_test_runner import BaseTestRunner
@@ skipping 38 matching lines @@
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
 
     logging.warning('Test suite: ' + test_suite)
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = TestPackageApk(self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           self.tool, self.dump_debug_info)
     else:
+      # Put a copy into the android out/target directory, to allow stack trace
+      # generation.
+      symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type,
+                                 'lib.target')
       self.test_package = TestPackageExecutable(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
-          self.tool, self.dump_debug_info)
+          self.tool, self.dump_debug_info, symbols_dir)
     self._performance_test_setup = None
     if performance_test:
       self._performance_test_setup = perf_tests_helper.PerfTestSetup(self.adb)
 
   def _TestSuiteRequiresMockTestServer(self):
     """Returns True if the test suite requires mock test server."""
-    return False
-  # TODO(yfriedman): Disabled because of flakiness.
-  # (self.test_package.test_suite_basename == 'unit_tests' or
-  #          self.test_package.test_suite_basename == 'net_unittests' or
-  #          False)

[Anthony Berent, 2012/10/25 16:02:05]

No longer flaky

+    tests_require_net_test_server = ['unit_tests', 'net_unittests',
+                                     'content_unittests']
+    return (self.test_package.test_suite_basename in
+            tests_require_net_test_server)
 
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
     return os.path.join(sys.path[0], 'gtest_filter',
         self.test_package.test_suite_basename + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
     return os.path.join(sys.path[0], 'gtest_filter',
         self.test_package.test_suite_basename +
@@ skipping 105 matching lines @@
         ]
       if self.test_package.test_suite_basename == 'unit_tests':
         test_files += ['chrome/test/data/simple_open_search.xml']
         # The following are spell check data. Now only list the data under
         # third_party/hunspell_dictionaries which are used by unit tests.
         old_cwd = os.getcwd()
         os.chdir(constants.CHROME_DIR)
         test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
         os.chdir(old_cwd)
       return test_files
+    elif self.test_package.test_suite_basename == 'media_unittests':
+      return [
+          'media/test/data',
+      ]
     elif self.test_package.test_suite_basename == 'net_unittests':
       return [
           'net/data/cache_tests',
           'net/data/filter_unittests',
           'net/data/ftp',
           'net/data/proxy_resolver_v8_unittest',
           'net/data/ssl/certificates',
           'net/data/url_request_unittest/',
           'net/data/proxy_script_fetcher_unittest'
           ]
     elif self.test_package.test_suite_basename == 'ui_tests':
       return [
           'chrome/test/data/dromaeo',
           'chrome/test/data/json2.js',
           'chrome/test/data/sunspider',
           'chrome/test/data/v8_benchmark',
           'chrome/test/perf/sunspider_uitest.js',
           'chrome/test/perf/v8_benchmark_uitest.js',
           ]
-    elif self.test_package.test_suite_basename == 'page_cycler_tests':
-      data = [
-          'tools/page_cycler',
-          'data/page_cycler',
-          ]
-      for d in data:
-        if not os.path.exists(d):
-          raise Exception('Page cycler data not found.')
-      return data

[Anthony Berent, 2012/10/25 16:02:05]

Page cycler tests now run by other means.

     elif self.test_package.test_suite_basename == 'webkit_unit_tests':
       return [
           'third_party/WebKit/Source/WebKit/chromium/tests/data',
           ]
     elif self.test_package.test_suite_basename == 'content_unittests':
       return [
           'content/test/data/gpu/webgl_conformance_test_expectations.txt',
           'net/data/ssl/certificates/',
           'webkit/data/dom_storage/webcore_test_database.localstorage',
           'third_party/hyphen/hyph_en_US.dic',
@@ skipping 97 matching lines @@
     self.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self._performance_test_setup:
       self._performance_test_setup.TearDown()
     if self.dump_debug_info:
       self.dump_debug_info.ArchiveNewCrashFiles()
     super(SingleTestRunner, self).TearDown()