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

Side by Side 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 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // Flaky. See http://crbug.com/70643. 76 // Flaky. See http://crbug.com/70643.
77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) { 77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) {
78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); 78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html"))));
79 } 79 }
80 80
81 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { 81 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) {
82 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); 82 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
83 } 83 }
84 84
85 // Flaky. See http://crbug.com/70643. 85 // Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
86 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_TransactionTest) { 86 #if defined(OS_LINUX)
87 #define MAYBE_TransactionTest DISABLED_TransactionTest
88 #else
89 #define MAYBE_TransactionTest FLAKY_TransactionTest
90 #endif
91
92 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_TransactionTest) {
87 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); 93 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
88 } 94 }
89 95
90 // Flaky. See http://crbug.com/70643. 96 // Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
91 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_DoesntHangTest) { 97 #if defined(OS_LINUX)
98 #define MAYBE_DoesntHangTest DISABLED_DoesntHangTest
99 #else
100 #define MAYBE_DoesntHangTest FLAKY_DoesntHangTest
101 #endif
102
103 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_DoesntHangTest) {
92 SimpleTest(testUrl(FilePath( 104 SimpleTest(testUrl(FilePath(
93 FILE_PATH_LITERAL("transaction_run_forever.html")))); 105 FILE_PATH_LITERAL("transaction_run_forever.html"))));
94 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); 106 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
95 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); 107 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
96 } 108 }
97 109
98 // In proc browser test is needed here because ClearLocalState indirectly calls 110 // In proc browser test is needed here because ClearLocalState indirectly calls
99 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. 111 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin.
100 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { 112 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) {
101 // Create test files. 113 // Create test files.
(...skipping 24 matching lines...) Expand all
126 // Make sure we wait until the destructor has run. 138 // Make sure we wait until the destructor has run.
127 scoped_refptr<ThreadTestHelper> helper( 139 scoped_refptr<ThreadTestHelper> helper(
128 new ThreadTestHelper(BrowserThread::WEBKIT)); 140 new ThreadTestHelper(BrowserThread::WEBKIT));
129 ASSERT_TRUE(helper->Run()); 141 ASSERT_TRUE(helper->Run());
130 142
131 // Because we specified https for scheme to be skipped the second file 143 // Because we specified https for scheme to be skipped the second file
132 // should survive and the first go into vanity. 144 // should survive and the first go into vanity.
133 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); 145 ASSERT_FALSE(file_util::PathExists(temp_file_path_1));
134 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); 146 ASSERT_TRUE(file_util::PathExists(temp_file_path_2));
135 } 147 }
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