Index: content/browser/in_process_webkit/indexed_db_layout_browsertest.cc |
diff --git a/content/browser/in_process_webkit/indexed_db_layout_browsertest.cc b/content/browser/in_process_webkit/indexed_db_layout_browsertest.cc |
index 60798d57d07690fbd72e85c6dcb3a1e70a5022a9..5f6e9c4588203c242fecaa3e65f9f26182dc6a68 100644 |
--- a/content/browser/in_process_webkit/indexed_db_layout_browsertest.cc |
+++ b/content/browser/in_process_webkit/indexed_db_layout_browsertest.cc |
@@ -39,12 +39,15 @@ static const char* kBasicTests[] = { |
static const char* kComplexTests[] = { |
"prefetch-bugfix-108071.html", |
- "pending-version-change-stuck-works-with-terminate.html", |
+ // Flaky: http://crbug.com/123685 |
jsbell
2012/04/30 22:48:54
Formatting-wise, take a look at content/browser/ap
|
+// "pending-version-change-stuck-works-with-terminate.html", |
jsbell
2012/04/30 22:48:54
leading // should be indented 2 spaces to align wi
dgrogan
2012/05/01 00:46:08
Done.
|
NULL |
}; |
static const char* kIndexTests[] = { |
"deleteIndex.html", |
+ // Flaky: http://crbug.com/123685 |
+// "index-basics-workers.html", |
jsbell
2012/04/30 22:48:54
Same formatting as above: 2 spaces before //, 1 af
dgrogan
2012/05/01 00:46:08
Done.
|
"index-count.html", |
"index-cursor.html", // Locally takes ~6s compared to <1 for the others. |
"index-get-key-argument-required.html", |
@@ -100,13 +103,6 @@ IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, ComplexTests) { |
RunLayoutTests(kComplexTests); |
} |
-// Frequently times out, sometimes due to webkit assertion failure. |
-// http://crbug.com/120924 |
jsbell
2012/04/30 22:48:54
Is 120924 a duplicate of 123685? If not, keep this
dgrogan
2012/05/01 00:46:08
It was kind of a duplicate. I closed it in any ca
|
-IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, FAILS_IndexBasicsWorkersTest) { |
- RunLayoutTest("deleteIndex.html"); |
- RunLayoutTest("index-basics-workers.html"); |
-} |
- |
IN_PROC_BROWSER_TEST_F(IndexedDBLayoutTest, IndexTests) { |
RunLayoutTests(kIndexTests); |
} |