summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 18:59:07 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 18:59:07 +0000
commitd10f82f6c62676297f2bb8f5908684f8ccdbaab8 (patch)
tree9748c51e31b3c3fe49a60207dae501e05600a142
parentdfe4823344911e96f1340d15efbeaf5cf735df2e (diff)
downloadchromium_src-d10f82f6c62676297f2bb8f5908684f8ccdbaab8.zip
chromium_src-d10f82f6c62676297f2bb8f5908684f8ccdbaab8.tar.gz
chromium_src-d10f82f6c62676297f2bb8f5908684f8ccdbaab8.tar.bz2
Android: Enable FileUtilProxyTest.Touch and PlatformFile.TouchGetInfoPlatformFile.
BUG=86494 These are passing. TBR=jar@chromium.org Review URL: https://chromiumcodereview.appspot.com/13934025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197099 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/platform_file_unittest.cc4
-rw-r--r--build/android/pylib/gtest/filter/base_unittests_disabled2
2 files changed, 4 insertions, 2 deletions
diff --git a/base/platform_file_unittest.cc b/base/platform_file_unittest.cc
index 36ec3ee..7483876 100644
--- a/base/platform_file_unittest.cc
+++ b/base/platform_file_unittest.cc
@@ -262,7 +262,11 @@ TEST(PlatformFile, TruncatePlatformFile) {
}
// Flakily fails: http://crbug.com/86494
+#if defined(OS_ANDROID)
+TEST(PlatformFile, TouchGetInfoPlatformFile) {
+#else
TEST(PlatformFile, DISABLED_TouchGetInfoPlatformFile) {
+#endif
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::PlatformFile file = base::CreatePlatformFile(
diff --git a/build/android/pylib/gtest/filter/base_unittests_disabled b/build/android/pylib/gtest/filter/base_unittests_disabled
index d489605..ca5179a 100644
--- a/build/android/pylib/gtest/filter/base_unittests_disabled
+++ b/build/android/pylib/gtest/filter/base_unittests_disabled
@@ -16,8 +16,6 @@ StringPrintfTest.StringPrintfBounds
ProcessUtilTest.GetAppOutputRestrictedSIGPIPE
# TODO(jrg): Fails on bots. Works locally. Figure out why. 2/6/12
FieldTrialTest.*
-# Failed on bot since it was first introduced.
-FileUtilProxyTest.Touch
# Flaky?
ScopedJavaRefTest.RefCounts
# Death tests are not supported with apks.