Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: chrome/browser/in_process_webkit/indexed_db_browsertest.cc

Issue 6258019: Disable IndexedDBBrowserTest.KeyPathTest per WebKit revision 76531.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/ref_counted.h" 8 #include "base/ref_counted.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) { 51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); 52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
53 } 53 }
54 54
55 // Flaky. See http://crbug.com/70643. 55 // Flaky. See http://crbug.com/70643.
56 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_IndexTest) { 56 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_IndexTest) {
57 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); 57 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
58 } 58 }
59 59
60 // Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293. 60 // Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293.
61 #if defined(OS_WIN) 61 //#if defined(OS_WIN)
62 #define MAYBE_KeyPathTest FLAKY_KeyPathTest 62 //#define MAYBE_KeyPathTest FLAKY_KeyPathTest
63 #else 63 //#else
64 #define MAYBE_KeyPathTest KeyPathTest 64 //#define MAYBE_KeyPathTest KeyPathTest
65 #endif 65 //#endif
66 66
67 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_KeyPathTest) { 67 // Disabled per http://trac.webkit.org/changeset/76531. See http://crbug.com/706 65.
68 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
68 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); 69 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
69 } 70 }
70 71
71 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { 72 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
72 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); 73 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
73 } 74 }
74 75
75 // Flaky. See http://crbug.com/70643. 76 // Flaky. See http://crbug.com/70643.
76 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) { 77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) {
77 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); 78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html"))));
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Make sure we wait until the destructor has run. 126 // Make sure we wait until the destructor has run.
126 scoped_refptr<ThreadTestHelper> helper( 127 scoped_refptr<ThreadTestHelper> helper(
127 new ThreadTestHelper(BrowserThread::WEBKIT)); 128 new ThreadTestHelper(BrowserThread::WEBKIT));
128 ASSERT_TRUE(helper->Run()); 129 ASSERT_TRUE(helper->Run());
129 130
130 // Because we specified https for scheme to be skipped the second file 131 // Because we specified https for scheme to be skipped the second file
131 // should survive and the first go into vanity. 132 // should survive and the first go into vanity.
132 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); 133 ASSERT_FALSE(file_util::PathExists(temp_file_path_1));
133 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); 134 ASSERT_TRUE(file_util::PathExists(temp_file_path_2));
134 } 135 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698