Commit c185b0fc authored by isherman@chromium.org's avatar isherman@chromium.org

Mark IFrameTest.InEmptyFrame and PopupBlockerBrowserTest.PopupBlockedPostBlank as flaky on ChromeOS

BUG=70192
TEST=greener tree
TBR= estade@chromium.org, oshima@chromium.org

Review URL: http://codereview.chromium.org/6366005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71931 0039d316-1c4b-4281-b951-d872f2087c98
parent fb82d5ab
...@@ -23,6 +23,12 @@ TEST_F(IFrameTest, Crash) { ...@@ -23,6 +23,12 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test"); NavigateAndVerifyTitle("iframe.html", L"iframe test");
} }
TEST_F(IFrameTest, InEmptyFrame) { #if defined(OS_CHROMEOS)
// Flakily crashes on ChromeOS: http://crbug.com/70192
#define MAYBE_InEmptyFrame DISABLED_InEmptyFrame
#else
#define MAYBE_InEmptyFrame InEmptyFrame
#endif
TEST_F(IFrameTest, MAYBE_InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test"); NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
} }
...@@ -23,7 +23,13 @@ static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker"); ...@@ -23,7 +23,13 @@ static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");
typedef InProcessBrowserTest PopupBlockerBrowserTest; typedef InProcessBrowserTest PopupBlockerBrowserTest;
IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) { #if defined(OS_CHROMEOS)
// Flakily crashes on ChromeOS: http://crbug.com/70192
#define MAYBE_PopupBlockedPostBlank DISABLED_PopupBlockedPostBlank
#else
#define MAYBE_PopupBlockedPostBlank PopupBlockedPostBlank
#endif
IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MAYBE_PopupBlockedPostBlank) {
FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")); FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html"));
FilePath test_dir(kTestDir); FilePath test_dir(kTestDir);
GURL url(ui_test_utils::GetTestUrl(test_dir, file_name)); GURL url(ui_test_utils::GetTestUrl(test_dir, file_name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment