summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 13:50:57 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 13:50:57 +0000
commitdced814241f30f69767a962d1c79211ca5308c05 (patch)
tree9b501e103e9485cc77f72ac10008b9156bb667e3 /webkit/fileapi
parenta93ebbb1d188570969bf62384618707400beac9c (diff)
downloadchromium_src-dced814241f30f69767a962d1c79211ca5308c05.zip
chromium_src-dced814241f30f69767a962d1c79211ca5308c05.tar.gz
chromium_src-dced814241f30f69767a962d1c79211ca5308c05.tar.bz2
[FileAPI] Disable LocalFileSyncContextTest.PrepareSyncWhileWriting on android
BUG=239793 TBR=kinuko@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/14823010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
-rw-r--r--webkit/fileapi/syncable/local_file_sync_context_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
index a2f83ee..575493b 100644
--- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -332,7 +332,14 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
file_system2.TearDown();
}
-TEST_F(LocalFileSyncContextTest, PrepareSyncWhileWriting) {
+// LocalFileSyncContextTest.PrepareSyncWhileWriting is flaky on android.
+// http://crbug.com/239793
+#if define(OS_ANDROID)
+#define MAYBE_PrepareSyncWhileWriting DISABLED_PrepareSyncWhileWriting
+#else
+#define MAYBE_PrepareSyncWhileWriting PrepareSyncWhileWriting
+#endif
+TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) {
CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
io_task_runner_, file_task_runner_);
file_system.SetUp();