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

Side by Side Diff: content/browser/in_process_webkit/indexed_db_layout_browsertest.cc

Issue 12387105: IndexedDB: Re-enable previously flaky tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/test/layout_browsertest.h" 5 #include "content/test/layout_browsertest.h"
6 6
7 namespace content { 7 namespace content {
8 8
9 class IndexedDBLayoutTest : public InProcessBrowserLayoutTest { 9 class IndexedDBLayoutTest : public InProcessBrowserLayoutTest {
10 public: 10 public:
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 static const char* kKeyTests[] = { 57 static const char* kKeyTests[] = {
58 "key-generator.html", 58 "key-generator.html",
59 "keypath-basics.html", 59 "keypath-basics.html",
60 "keypath-edges.html", 60 "keypath-edges.html",
61 "keypath-fetch-key.html", 61 "keypath-fetch-key.html",
62 "keyrange.html", 62 "keyrange.html",
63 "keyrange-required-arguments.html", 63 "keyrange-required-arguments.html",
64 "key-sort-order-across-types.html", 64 "key-sort-order-across-types.html",
65 "key-sort-order-date.html", 65 "key-sort-order-date.html",
66 // Flaky: http://crbug.com/165671 66 "key-type-array.html",
67 //"key-type-array.html",
68 "key-type-infinity.html", 67 "key-type-infinity.html",
69 "invalid-keys.html", 68 "invalid-keys.html",
70 NULL 69 NULL
71 }; 70 };
72 71
73 static const char* kTransactionTests[] = { 72 static const char* kTransactionTests[] = {
74 "transaction-abort.html", 73 "transaction-abort.html",
75 "transaction-complete-with-js-recursion-cross-frame.html", 74 "transaction-complete-with-js-recursion-cross-frame.html",
76 "transaction-complete-with-js-recursion.html", 75 "transaction-complete-with-js-recursion.html",
77 "transaction-complete-workers.html", 76 "transaction-complete-workers.html",
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 114
116 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, BasicTests) { 115 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, BasicTests) {
117 RunLayoutTests(kBasicTests); 116 RunLayoutTests(kBasicTests);
118 } 117 }
119 118
120 119
121 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, ComplexTests) { 120 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, ComplexTests) {
122 RunLayoutTests(kComplexTests); 121 RunLayoutTests(kComplexTests);
123 } 122 }
124 123
125 // TODO(dgrogan): times out flakily. http://crbug.com/153064 124 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IndexTests) {
126 // Marking FLAKY to diagnose if this is just a test duration
127 // issue (and we need to split it up) or something else.
128 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, FLAKY_IndexTests) {
129 RunLayoutTests(kIndexTests); 125 RunLayoutTests(kIndexTests);
130 } 126 }
131 127
132 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, KeyTests) { 128 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, KeyTests) {
133 RunLayoutTests(kKeyTests); 129 RunLayoutTests(kKeyTests);
134 } 130 }
135 131
136 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, TransactionTests) { 132 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, TransactionTests) {
137 RunLayoutTests(kTransactionTests); 133 RunLayoutTests(kTransactionTests);
138 } 134 }
139 135
140 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IntVersionTests1) { 136 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IntVersionTests1) {
141 RunLayoutTests(kIntVersionTests1); 137 RunLayoutTests(kIntVersionTests1);
142 } 138 }
143 139
144 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IntVersionTests2) { 140 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IntVersionTests2) {
145 RunLayoutTests(kIntVersionTests2); 141 RunLayoutTests(kIntVersionTests2);
146 } 142 }
147 143
148 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, RegressionTests) { 144 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, RegressionTests) {
149 RunLayoutTests(kRegressionTests); 145 RunLayoutTests(kRegressionTests);
150 } 146 }
151 147
152 // TODO(jsbell): Remove this when data has been gathered.
153 IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, FLAKY_FlakyTests) {
154 RunLayoutTest("key-type-array.html");
155 }
156
157 } // namespace content 148 } // namespace content
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