Flakiness cleanup: disable flaky tests under chrome/test/

chrome/test/reliability/automated_ui_test_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/reliability/automated_ui_test_base.h"
@@ skipping 62 matching lines @@
   CloseActiveTab();
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
   RestoreTab();
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 }
 
 #if defined(OS_WIN)
 // crbug.com/96049
-#define MAYBE_CloseTab FLAKY_CloseTab
+#define MAYBE_CloseTab DISABLED_CloseTab
 #elif defined(OS_MACOSX)
 // crbug.com/112821
-#define MAYBE_CloseTab FLAKY_CloseTab
+#define MAYBE_CloseTab DISABLED_CloseTab
 #else
 #define MAYBE_CloseTab CloseTab
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_CloseTab) {
   int num_browser_windows;
   int tab_count;
   NewTab();
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
@@ skipping 29 matching lines @@
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 
   // The last tab should not be closed.
   ASSERT_FALSE(CloseActiveTab());
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 }
 
 // Flakiness tracked there: http://crbug.com/96049.
-TEST_F(AutomatedUITestBase, FLAKY_OpenBrowserWindow) {
+TEST_F(AutomatedUITestBase, DISABLED_OpenBrowserWindow) {
   int num_browser_windows;
   int tab_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 
   scoped_refptr<BrowserProxy> browser_1;
   ASSERT_TRUE(OpenAndActivateNewBrowserWindow(&browser_1));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
@@ skipping 27 matching lines @@
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(2, num_browser_windows);
   CloseBrowser(browser_2.get(), &application_closed);
   ASSERT_FALSE(application_closed);
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_CloseBrowserWindow FLAKY_CloseBrowserWindow
+#define MAYBE_CloseBrowserWindow DISABLED_CloseBrowserWindow
 #else
 #define MAYBE_CloseBrowserWindow CloseBrowserWindow
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_CloseBrowserWindow) {
   int tab_count;
   NewTab();
   ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 
@@ skipping 22 matching lines @@
     ASSERT_TRUE(CloseActiveWindow());
     ASSERT_TRUE(active_browser()->GetTabCount(&tab_count));
     ASSERT_EQ(2, tab_count);
   }
 
   ASSERT_FALSE(CloseActiveWindow());
 }
 
 // Flaky, see http://crbug.com/113046.
 #if defined(OS_MACOSX)
-#define MAYBE_IncognitoWindow FLAKY_IncognitoWindow
+#define MAYBE_IncognitoWindow DISABLED_IncognitoWindow
 #else
 #define MAYBE_IncognitoWindow IncognitoWindow
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_IncognitoWindow) {
   int num_browser_windows;
   int num_normal_browser_windows;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
   ASSERT_TRUE(
@@ skipping 20 matching lines @@
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_WIN)
 #define MAYBE_OpenCloseBrowserWindowWithAccelerator \
-        FLAKY_OpenCloseBrowserWindowWithAccelerator
+        DISABLED_OpenCloseBrowserWindowWithAccelerator
 #else
 #define MAYBE_OpenCloseBrowserWindowWithAccelerator \
         OpenCloseBrowserWindowWithAccelerator
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_OpenCloseBrowserWindowWithAccelerator) {
   // Note: we don't use RunCommand(IDC_OPEN/CLOSE_WINDOW) to open/close
   // browser window in automated ui tests. Instead we use
   // OpenAndActivateNewBrowserWindow and CloseActiveWindow.
   // There are other parts of UI test that use the accelerators. This is
@@ skipping 23 matching lines @@
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   set_active_browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(RunCommand(IDC_CLOSE_WINDOW));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&num_browser_windows));
   ASSERT_EQ(1, num_browser_windows);
 }
 
 // Flaky, see http://crbug.com/96039.
 #if defined(OS_MACOSX)
-#define MAYBE_Navigate FLAKY_Navigate
+#define MAYBE_Navigate DISABLED_Navigate
 #else
 #define MAYBE_Navigate Navigate
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_Navigate) {
   FilePath path_prefix(test_data_directory_.AppendASCII("session_history"));
   GURL url1(net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")));
   GURL url2(net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html")));
   GURL url3(net::FilePathToFileURL(path_prefix.AppendASCII("bot3.html")));
   GURL url;
@@ skipping 15 matching lines @@
   ASSERT_TRUE(ForwardButton());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
   ASSERT_TRUE(ReloadPage());
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(url2, url);
 }
 
 // Flaky, see http://crbug.com/81050.
 #if defined(OS_MACOSX)
-#define MAYBE_SelectTab FLAKY_SelectTab
+#define MAYBE_SelectTab DISABLED_SelectTab
 #else
 #define MAYBE_SelectTab SelectTab
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_SelectTab) {
   FilePath filename(test_data_directory_);
   filename = filename.AppendASCII("title2.html");
   GURL url = net::FilePathToFileURL(filename);
 
   ASSERT_TRUE(active_browser()->AppendTab(url));
@@ skipping 53 matching lines @@
 
 TEST_F(AutomatedUITestBase, ShowDownloads) {
   ASSERT_TRUE(ShowDownloads());
   GURL url;
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(GURL(chrome::kChromeUIDownloadsURL), url);
 }
 
 // Flaky, see http://crbug.com/81050.
 #if defined(OS_MACOSX)
-#define MAYBE_ShowHistory FLAKY_ShowHistory
+#define MAYBE_ShowHistory DISABLED_ShowHistory
 #else
 #define MAYBE_ShowHistory ShowHistory
 #endif
 
 TEST_F(AutomatedUITestBase, MAYBE_ShowHistory) {
   ASSERT_TRUE(ShowHistory());
   GURL url;
   ASSERT_TRUE(GetActiveTab()->GetCurrentURL(&url));
   ASSERT_EQ(GURL(chrome::kChromeUIHistoryURL), url);
 }