summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 20:51:02 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 20:51:02 +0000
commitde970f348af1438c28c85c84d185be9d89e42680 (patch)
treed9db3730e53ae3fa967f5220879766a0668d8631 /chrome/test/automation
parent0673a287b937d66440deb4880f94499efd2e3b4d (diff)
downloadchromium_src-de970f348af1438c28c85c84d185be9d89e42680.zip
chromium_src-de970f348af1438c28c85c84d185be9d89e42680.tar.gz
chromium_src-de970f348af1438c28c85c84d185be9d89e42680.tar.bz2
Marking DOMAutomationTest.FindByXPath as flaky on windows.
BUG=61636 TEST=None. Absolutely none. Review URL: http://codereview.chromium.org/4231004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/dom_automation_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/automation/dom_automation_browsertest.cc b/chrome/test/automation/dom_automation_browsertest.cc
index 502797d..a5f8209 100644
--- a/chrome/test/automation/dom_automation_browsertest.cc
+++ b/chrome/test/automation/dom_automation_browsertest.cc
@@ -31,7 +31,14 @@ class DOMAutomationTest : public InProcessBrowserTest {
typedef DOMElementProxy::By By;
-IN_PROC_BROWSER_TEST_F(DOMAutomationTest, FindByXPath) {
+#if defined(OS_WIN)
+// See http://crbug.com/61636
+#define MAYBE_FindByXPath FLAKY_FindByXPath
+#else
+#define MAYBE_FindByXPath FindByXPath
+#endif
+
+IN_PROC_BROWSER_TEST_F(DOMAutomationTest, MAYBE_FindByXPath) {
ASSERT_TRUE(test_server()->Start());
ui_test_utils::NavigateToURL(browser(),
GetTestURL("find_elements/test.html"));