summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 18:25:25 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 18:25:25 +0000
commit0f1c0ba48f47e28168d1b1261709d336374b6cd5 (patch)
treef83ac3ae4a74270a4cf86b0ebd60133b62de0490 /chrome/test
parent1625ffd487b4d361d6ad0679457a43a5119601e2 (diff)
downloadchromium_src-0f1c0ba48f47e28168d1b1261709d336374b6cd5.zip
chromium_src-0f1c0ba48f47e28168d1b1261709d336374b6cd5.tar.gz
chromium_src-0f1c0ba48f47e28168d1b1261709d336374b6cd5.tar.bz2
Marked several tests flaky.
BUG=74548 BUG=74549 BUG=74554 BUG=74557 TEST=None Review URL: http://codereview.chromium.org/6594079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/plugin/pdf_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/plugin/pdf_browsertest.cc b/chrome/test/plugin/pdf_browsertest.cc
index 233ffaa..7f3f902 100644
--- a/chrome/test/plugin/pdf_browsertest.cc
+++ b/chrome/test/plugin/pdf_browsertest.cc
@@ -251,7 +251,8 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, FindAndCopy) {
// Tests that loading async pdfs works correctly (i.e. document fully loads).
// This also loads all documents that used to crash, to ensure we don't have
// regressions.
-IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) {
+// Flaky as per http://crbug.com/74548.
+IN_PROC_BROWSER_TEST_F(PDFBrowserTest, FLAKY_SLOW_Loading) {
ASSERT_TRUE(pdf_test_server()->Start());
NavigationController* controller =
@@ -305,7 +306,8 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) {
}
}
-IN_PROC_BROWSER_TEST_F(PDFBrowserTest, OnLoadAndReload) {
+// Flaky as per http://crbug.com/74549.
+IN_PROC_BROWSER_TEST_F(PDFBrowserTest, FLAKY_OnLoadAndReload) {
ASSERT_TRUE(pdf_test_server()->Start());
GURL url = pdf_test_server()->GetURL("files/onload_reload.html");