summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 13:55:23 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 13:55:23 +0000
commit69b5da50dce143d76d54e4ee25f12e1ed6bcf762 (patch)
tree3c5fa465d5f8a6706bbb0a06c5f2c3709e161355 /chrome/browser/autocomplete
parent80ddb0445a0ac70b0d7dfc92c51e052b54a9ef18 (diff)
downloadchromium_src-69b5da50dce143d76d54e4ee25f12e1ed6bcf762.zip
chromium_src-69b5da50dce143d76d54e4ee25f12e1ed6bcf762.tar.gz
chromium_src-69b5da50dce143d76d54e4ee25f12e1ed6bcf762.tar.bz2
Disable all AutocompleteEditViewTest tests as they timeout on windows.
BUG=57965 TEST=none TBR=isherman@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc68
1 files changed, 58 insertions, 10 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index c54ef03..2890fdd 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -277,7 +277,13 @@ class AutocompleteEditViewTest : public InProcessBrowserTest,
// Test if ctrl-* accelerators are workable in omnibox.
// See http://crbug.com/19193: omnibox blocks ctrl-* commands
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BrowserAccelerators) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_BrowserAccelerators DISABLED_BrowserAccelerators
+#else
+#define MAYBE_BrowserAccelerators BrowserAccelerators
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_BrowserAccelerators) {
browser()->FocusLocationBar();
AutocompleteEditView* edit_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
@@ -330,9 +336,9 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BrowserAccelerators) {
#endif
}
-// FLAKY on windows, http://crbug.com/57965
+// FAILS on windows, http://crbug.com/57965
#if defined(OS_WIN)
-#define MAYBE_PopupAccelerators FLAKY_PopupAccelerators
+#define MAYBE_PopupAccelerators DISABLED_PopupAccelerators
#else
#define MAYBE_PopupAccelerators PopupAccelerators
#endif
@@ -383,7 +389,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_PopupAccelerators) {
#endif
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BackspaceInKeywordMode) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_BackspaceInKeywordMode DISABLED_BackspaceInKeywordMode
+#else
+#define MAYBE_BackspaceInKeywordMode BackspaceInKeywordMode
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_BackspaceInKeywordMode) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
browser()->FocusLocationBar();
@@ -435,7 +447,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, BackspaceInKeywordMode) {
WideToUTF8(edit_view->GetText()));
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, Escape) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_Escape DISABLED_Escape
+#else
+#define MAYBE_Escape Escape
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_Escape) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
browser()->FocusLocationBar();
@@ -457,7 +475,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, Escape) {
EXPECT_TRUE(edit_view->IsSelectAll());
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, DesiredTLD) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_DesiredTLD DISABLED_DesiredTLD
+#else
+#define MAYBE_DesiredTLD DesiredTLD
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_DesiredTLD) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
browser()->FocusLocationBar();
@@ -477,7 +501,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, DesiredTLD) {
EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, AltEnter) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_AltEnter DISABLED_AltEnter
+#else
+#define MAYBE_AltEnter AltEnter
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_AltEnter) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
browser()->FocusLocationBar();
@@ -491,7 +521,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, AltEnter) {
ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToSearch) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_EnterToSearch DISABLED_EnterToSearch
+#else
+#define MAYBE_EnterToSearch EnterToSearch
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EnterToSearch) {
ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
browser()->FocusLocationBar();
@@ -535,7 +571,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToSearch) {
// See http://crbug.com/20934: Omnibox keyboard behavior wrong for
// "See recent pages in history"
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToOpenHistoryPage) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_EnterToOpenHistoryPage DISABLED_EnterToOpenHistoryPage
+#else
+#define MAYBE_EnterToOpenHistoryPage EnterToOpenHistoryPage
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EnterToOpenHistoryPage) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
browser()->FocusLocationBar();
@@ -572,7 +614,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToOpenHistoryPage) {
EXPECT_STREQ(kHistoryPageURL, url.spec().c_str());
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EscapeToDefaultMatch) {
+// FAILS on windows, http://crbug.com/57965
+#if defined(OS_WIN)
+#define MAYBE_EscapeToDefaultMatch DISABLED_EscapeToDefaultMatch
+#else
+#define MAYBE_EscapeToDefaultMatch EscapeToDefaultMatch
+#endif
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_EscapeToDefaultMatch) {
ASSERT_NO_FATAL_FAILURE(SetupComponents());
browser()->FocusLocationBar();