summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_browsertest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:43:56 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 17:43:56 +0000
commitb6ab13fda73f81f7fa93dcc3ad33cd4cd8cdb82b (patch)
treeba222d5d5ebd6c5f6c6b80031ba6959626c107be /chrome/browser/autocomplete/autocomplete_browsertest.cc
parente8552034f762cf76a28c7407a05276f6dfbbd9d0 (diff)
downloadchromium_src-b6ab13fda73f81f7fa93dcc3ad33cd4cd8cdb82b.zip
chromium_src-b6ab13fda73f81f7fa93dcc3ad33cd4cd8cdb82b.tar.gz
chromium_src-b6ab13fda73f81f7fa93dcc3ad33cd4cd8cdb82b.tar.bz2
Mark AutocompleteBrowserTest.Basic as flaky.
TBR=phajdan.jr@chromium.org BUG=49324 TEST=none Review URL: http://codereview.chromium.org/3020007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_browsertest.cc')
-rw-r--r--chrome/browser/autocomplete/autocomplete_browsertest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index a9e25df..11019bd 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -18,6 +18,14 @@
#include "chrome/test/ui_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
+// Basic test is flaky on Mac
+// http://crbug.com/49324
+#if defined(OS_MAC)
+#define MAYBE_Basic FLAKY_Basic
+#else
+#define MAYBE_Basic Basic
+#endif
+
namespace {
std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
@@ -53,7 +61,7 @@ class AutocompleteBrowserTest : public InProcessBrowserTest {
}
};
-IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
LocationBar* location_bar = GetLocationBar();
EXPECT_EQ(std::wstring(), location_bar->GetInputString());