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-10-14 08:24:13 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 08:24:13 +0000
commit1be341329409a49db07ca4406eb83b5c0b7cf1c2 (patch)
treeeae820f5c7e658b37bb51e2d58877bceb6fe87c2 /chrome/test/automation
parenta4bce59e4e4cf40588be7444ec4f1ca38583b4f8 (diff)
downloadchromium_src-1be341329409a49db07ca4406eb83b5c0b7cf1c2.zip
chromium_src-1be341329409a49db07ca4406eb83b5c0b7cf1c2.tar.gz
chromium_src-1be341329409a49db07ca4406eb83b5c0b7cf1c2.tar.bz2
Mark AutomationProxyVisibleTest.AutocompleteMatchesTest as flaky.
TBR=jknotten BUG=19876, 48601 TEST=ui_tests Review URL: http://codereview.chromium.org/3803003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 8c19ac7..0ce8bcb 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -1351,8 +1351,11 @@ TEST_F(AutomationProxyTest, AutocompleteParallelProxy) {
#endif // defined(OS_WIN) || defined(OS_LINUX)
#if defined(OS_MACOSX)
-// TODO(port): Implement AutocompleteEditProxy on Mac.
+// Disabled, http://crbug.com/48601.
#define AutocompleteMatchesTest DISABLED_AutocompleteMatchesTest
+#else
+// Flaky, http://crbug.com/19876.
+#define AutocompleteMatchesTest FLAKY_AutocompleteMatchesTest
#endif
TEST_F(AutomationProxyVisibleTest, AutocompleteMatchesTest) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));