diff options
Diffstat (limited to 'chrome/test/automation/automation_proxy_uitest.cc')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 529cdb5..a43993c 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -1199,10 +1199,17 @@ class ExternalTabUITestPopupEnabled : public ExternalTabUITest { } }; +#if defined(OS_WIN) +// http://crbug.com/61023 - Fails on one popular operating system. +#define MAYBE_WindowDotOpen FLAKY_WindowDotOpen +#else +#define MAYBE_WindowDotOpen WindowDotOpen +#endif + // Testing AutomationMsg_AttachExternalTab callback from Chrome. // Open a popup window with window.open() call. The created popup window opens // another popup window (again using window.open() call). -TEST_F(ExternalTabUITestPopupEnabled, WindowDotOpen) { +TEST_F(ExternalTabUITestPopupEnabled, MAYBE_WindowDotOpen) { TimedMessageLoopRunner loop(MessageLoop::current()); ASSERT_THAT(mock_, testing::NotNull()); mock_->IgnoreFavIconNetworkRequest(); |