Fix the failed cases in URLFetcherFileTest on Android.

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 48 matching lines @@
       self.test_package = TestPackageExecutable(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           self.tool, self.dump_debug_info)
     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)
+    return (self.test_package.test_suite_basename == 'net_unittests' or False)

[Isaac (away), 2012/09/26 06:42:05]

we can remove 'or False'.  It doesn't change the boolean evaluation of the
statement.

 
   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 107 matching lines @@
         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 == 'net_unittests':
       return [
+          'chrome/test/data/animate1.gif',
+          'chrome/test/data/simple.html',
           '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 [
@@ skipping 123 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()