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

Unified Diff: chrome/browser/in_process_webkit/indexed_db_browsertest.cc

Issue 6339010: Disable IndexedDBBrowserTest.TransactionTest and IndexedDBBrowserTest.DoesntH... (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/in_process_webkit/indexed_db_browsertest.cc
===================================================================
--- chrome/browser/in_process_webkit/indexed_db_browsertest.cc (revision 72412)
+++ chrome/browser/in_process_webkit/indexed_db_browsertest.cc (working copy)
@@ -82,13 +82,25 @@
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
}
-// Flaky. See http://crbug.com/70643.
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_TransactionTest) {
+// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
+#if defined(OS_LINUX)
+#define MAYBE_TransactionTest DISABLED_TransactionTest
+#else
+#define MAYBE_TransactionTest FLAKY_TransactionTest
+#endif
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_TransactionTest) {
SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
}
-// Flaky. See http://crbug.com/70643.
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_DoesntHangTest) {
+// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
+#if defined(OS_LINUX)
+#define MAYBE_DoesntHangTest DISABLED_DoesntHangTest
+#else
+#define MAYBE_DoesntHangTest FLAKY_DoesntHangTest
+#endif
+
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_DoesntHangTest) {
SimpleTest(testUrl(FilePath(
FILE_PATH_LITERAL("transaction_run_forever.html"))));
ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
« 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