OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "base/threading/platform_thread.h" | 8 #include "base/threading/platform_thread.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/test/automation/automation_proxy.h" | 10 #include "chrome/test/automation/automation_proxy.h" |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
842 "resolve-url.html", | 842 "resolve-url.html", |
843 "resolve-url-sync.html" | 843 "resolve-url-sync.html" |
844 }; | 844 }; |
845 RunWorkerFileSystemLayoutHttpTests(kLayoutTests, arraysize(kLayoutTests)); | 845 RunWorkerFileSystemLayoutHttpTests(kLayoutTests, arraysize(kLayoutTests)); |
846 } | 846 } |
847 | 847 |
848 #if defined(OS_LINUX) | 848 #if defined(OS_LINUX) |
849 // Fails on Linux due to an assert in WebKit's RNG. | 849 // Fails on Linux due to an assert in WebKit's RNG. |
850 // See http://webkit.org/b/55728. | 850 // See http://webkit.org/b/55728. |
851 #define FileFromFileEntry DISABLED_FileFromFileEntry | 851 #define FileFromFileEntry DISABLED_FileFromFileEntry |
| 852 #else |
| 853 // http://crbug.com/101996 |
| 854 #define FileFromFileEntry FLAKY_FileFromFileEntry |
852 #endif | 855 #endif |
853 TEST_F(WorkerFileSystemTest, FileFromFileEntry) { | 856 TEST_F(WorkerFileSystemTest, FileFromFileEntry) { |
854 RunWorkerFileSystemLayoutTest("file-from-file-entry.html"); | 857 RunWorkerFileSystemLayoutTest("file-from-file-entry.html"); |
855 } | 858 } |
856 | 859 |
857 #if defined(OS_LINUX) | 860 #if defined(OS_LINUX) |
858 // Fails on Linux due to an assert in WebKit's RNG. | 861 // Fails on Linux due to an assert in WebKit's RNG. |
859 // See http://webkit.org/b/55728. | 862 // See http://webkit.org/b/55728. |
860 #define FileFromFileEntrySync DISABLED_FileFromFileEntrySync | 863 #define FileFromFileEntrySync DISABLED_FileFromFileEntrySync |
861 #else | 864 #else |
(...skipping 23 matching lines...) Expand all Loading... |
885 } | 888 } |
886 | 889 |
887 #if defined(OS_LINUX) | 890 #if defined(OS_LINUX) |
888 // Fails on Linux due to an assert in WebKit's RNG. | 891 // Fails on Linux due to an assert in WebKit's RNG. |
889 // See http://webkit.org/b/55728. | 892 // See http://webkit.org/b/55728. |
890 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped | 893 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped |
891 #endif | 894 #endif |
892 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { | 895 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) { |
893 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); | 896 RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html"); |
894 } | 897 } |
OLD | NEW |