summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 13:26:29 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 13:26:29 +0000
commit7285f6ea8ca1e82f215c9c4d0cea09579cc45510 (patch)
tree905978a9ee4e58869ca20392d78da426fc2d207a /chrome
parent8cc4a4af9d4b747c91d2e03d6950b9fe41d4d2d7 (diff)
downloadchromium_src-7285f6ea8ca1e82f215c9c4d0cea09579cc45510.zip
chromium_src-7285f6ea8ca1e82f215c9c4d0cea09579cc45510.tar.gz
chromium_src-7285f6ea8ca1e82f215c9c4d0cea09579cc45510.tar.bz2
Marks TestEvalOnCallFrame, TestSetBreakpoint, QueuedSharedWorkerShutdown as flaky.
(they started failing after rolling WebKit 58304:58400 on http://src.chromium.org/viewvc/chrome?view=rev&revision=45795) BUG=42641,42718 Review URL: http://codereview.chromium.org/1801005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc6
-rw-r--r--chrome/worker/worker_uitest.cc2
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index ee99d55..27232df 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -342,7 +342,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
}
// Tests set breakpoint.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSetBreakpoint) {
+// Flaky, see http://crbug.com/42718
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, FLAKY_TestSetBreakpoint) {
RunTest("testSetBreakpoint", kDebuggerTestPage);
}
@@ -364,7 +365,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenScriptIsRunning) {
}
// Tests eval on call frame.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalOnCallFrame) {
+// Flaky, see http://crbug.com/42718
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, FLAKY_TestEvalOnCallFrame) {
RunTest("testEvalOnCallFrame", kDebuggerTestPage);
}
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index fc7c276..7eb7a45 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -556,7 +556,7 @@ TEST_F(WorkerTest, WorkerClose) {
}
// http://crbug.com/42641
-TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerShutdown) {
+TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerShutdown) {
// Tests to make sure that queued shared workers are started up when
// shared workers shut down.
int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;