summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 08:08:58 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 08:08:58 +0000
commitd4ecb0226cd40fcd239d768dc7e40ff1d2b7e695 (patch)
tree981324090ee7508c423f132a8a812b5a9fa68c5c /chrome/test/automation
parent8477e568f80707c5d504b602fe10afdab1ab20c8 (diff)
downloadchromium_src-d4ecb0226cd40fcd239d768dc7e40ff1d2b7e695.zip
chromium_src-d4ecb0226cd40fcd239d768dc7e40ff1d2b7e695.tar.gz
chromium_src-d4ecb0226cd40fcd239d768dc7e40ff1d2b7e695.tar.bz2
Switch AutomationProxyVisibleTest.AutocompleteMatchesTest from DISABLED
to FLAKY on Windows and Linux (required infrastructure is still not available on Mac). There is a slight possiblity that the flakiness has disappeared, but I don't think so. We're going to get more accurate data from the flakiness report. TEST=AutomationProxyVisibleTest.AutocompleteMatchesTest BUG=19876 Review URL: http://codereview.chromium.org/1530004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 31ed3e4..b037a25 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -1341,8 +1341,14 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
#endif // defined(OS_WIN) || defined(OS_LINUX)
-// So flaky, http://crbug.com/19876. Consult phajdan.jr before re-enabling.
-TEST_F(AutomationProxyVisibleTest, DISABLED_AutocompleteMatchesTest) {
+#if defined(OS_MACOSX)
+// TODO(port): Implement AutocompleteEditProxy on Mac.
+#define AutocompleteMatchesTest DISABLED_AutocompleteMatchesTest
+#else
+// So flaky, http://crbug.com/19876.
+#define AutocompleteMatchesTest FLAKY_AutocompleteMatchesTest
+#endif
+TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
scoped_refptr<AutocompleteEditProxy> edit(