diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 00:52:24 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 00:52:24 +0000 |
| commit | 7904c65f88ac1e031d25ee97f9d2f776166c0b39 (patch) | |
| tree | ed45a900ca1be9a5365dc85c6c9b25bb64b8d8f0 /chrome | |
| parent | 37865795c0f6cdcba6c0299b2ac56651c96520bc (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_browsertest.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_omnibox_apitest.cc | 10 |
2 files changed, 19 insertions, 2 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(); diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc index 1e3abc6..05fcb9b 100644 --- a/chrome/browser/extensions/extension_omnibox_apitest.cc +++ b/chrome/browser/extensions/extension_omnibox_apitest.cc @@ -19,6 +19,14 @@ #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" +// Basic test is flaky on ChromeOS. +// http://crbug.com/52929 +#if defined(OS_CHROMEOS) +#define MAYBE_Basic FLAKY_Basic +#else +#define MAYBE_Basic Basic +#endif + namespace { std::wstring AutocompleteResultAsString(const AutocompleteResult& result) { @@ -64,7 +72,7 @@ class OmniboxApiTest : public ExtensionApiTest { } }; -IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) { +IN_PROC_BROWSER_TEST_F(OmniboxApiTest, MAYBE_Basic) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); |