summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 00:52:24 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 00:52:24 +0000
commit7904c65f88ac1e031d25ee97f9d2f776166c0b39 (patch)
treeed45a900ca1be9a5365dc85c6c9b25bb64b8d8f0 /chrome/browser/autocomplete
parent37865795c0f6cdcba6c0299b2ac56651c96520bc (diff)
downloadchromium_src-7904c65f88ac1e031d25ee97f9d2f776166c0b39.zip
chromium_src-7904c65f88ac1e031d25ee97f9d2f776166c0b39.tar.gz
chromium_src-7904c65f88ac1e031d25ee97f9d2f776166c0b39.tar.bz2
Marked OmniboxApiTest.Basic and AutocompleteBrowserTest.Autocomplete flaky on ChromeOS. Both test fail consistently in autotest runs while manual run with --gfilter_test seems to be OK.
BUG=52928,52929 TEST=make sure these two test don't cause autotest to fail anymore Review URL: http://codereview.chromium.org/3150027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_browsertest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 0b53d19..26e071e 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -28,6 +28,15 @@
#define MAYBE_Basic Basic
#endif
+// Autocomplete test is flaky on ChromeOS.
+// http://crbug.com/52928
+#if defined(OS_CHROMEOS)
+#define MAYBE_Autocomplete FLAKY_Autocomplete
+#else
+#define MAYBE_Autocomplete Autocomplete
+#endif
+
+
namespace {
std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
@@ -101,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
}
-IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Autocomplete) {
+IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
// The results depend on the history backend being loaded. Make sure it is
// loaded so that the autocomplete results are consistent.
WaitForHistoryBackendToLoad();