Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: build/android/pylib/single_test_runner.py

Issue 10986042: Fix the failed cases in URLFetcherFileTest on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gtest_filter/net_unittests_disabled ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/single_test_runner.py
diff --git a/build/android/pylib/single_test_runner.py b/build/android/pylib/single_test_runner.py
index f95d9c3937a109c91c8edc642086bcc6abec874b..58b73a3f9ae9039b2cd5d37395ecebbe163ff1d2 100644
--- a/build/android/pylib/single_test_runner.py
+++ b/build/android/pylib/single_test_runner.py
@@ -66,11 +66,7 @@ class SingleTestRunner(BaseTestRunner):
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 b
def _GetFilterFileName(self):
"""Returns the filename of gtest filter."""
@@ -198,6 +194,8 @@ class SingleTestRunner(BaseTestRunner):
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',
« no previous file with comments | « build/android/gtest_filter/net_unittests_disabled ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698