summaryrefslogtreecommitdiffstats
path: root/base/platform_file_unittest.cc
diff options
context:
space:
mode:
authorleandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 14:16:47 +0000
committerleandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 14:16:47 +0000
commit49ecb960d685b5d73ddb3c9d490842de3c1dcd80 (patch)
tree6d2395f0c0ec806149d8f6630426248a81a46b1d /base/platform_file_unittest.cc
parent5e5430dfbd22a28cfa085ffd2e7107b05184a59f (diff)
downloadchromium_src-49ecb960d685b5d73ddb3c9d490842de3c1dcd80.zip
chromium_src-49ecb960d685b5d73ddb3c9d490842de3c1dcd80.tar.gz
chromium_src-49ecb960d685b5d73ddb3c9d490842de3c1dcd80.tar.bz2
Mark TouchGetInfoPlatformFile as Flaky on Mac OS X.
BUG=86494 TEST=PlatformFile.TouchGetInfoPlatformFile Review URL: http://codereview.chromium.org/7205001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/platform_file_unittest.cc')
-rw-r--r--base/platform_file_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/base/platform_file_unittest.cc b/base/platform_file_unittest.cc
index 35afdf8..0bd4fb3 100644
--- a/base/platform_file_unittest.cc
+++ b/base/platform_file_unittest.cc
@@ -249,7 +249,13 @@ TEST(PlatformFile, TruncatePlatformFile) {
base::ClosePlatformFile(file);
}
-TEST(PlatformFile, TouchGetInfoPlatformFile) {
+#if defined(OS_MACOSX)
+// Flakily fails: http://crbug.com/86494
+#define MAYBE_TouchGetInfoPlatformFile FLAKY_TouchGetInfoPlatformFile
+#else
+#define MAYBE_TouchGetInfoPlatformFile TouchGetInfoPlatformFile
+#endif
+TEST(PlatformFile, MAYBE_TouchGetInfoPlatformFile) {
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::PlatformFile file = base::CreatePlatformFile(