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', |