summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 16:46:02 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 16:46:02 +0000
commit6d74fd27cb304212abe145855b540051d2192aa9 (patch)
tree48eb22f1eadc94a0f90bd0efa1d9561c4263c0f3 /chrome/test/automation
parentc110df1c78cba5274ea1ce0af25faa9fb5703074 (diff)
downloadchromium_src-6d74fd27cb304212abe145855b540051d2192aa9.zip
chromium_src-6d74fd27cb304212abe145855b540051d2192aa9.tar.gz
chromium_src-6d74fd27cb304212abe145855b540051d2192aa9.tar.bz2
Mark WindowDotOpen flaky on Windows.
BUG=61023 TEST=trybots Review URL: http://codereview.chromium.org/4148008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc9
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();