summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-28 17:47:44 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-28 17:47:44 +0000
commitc56002eb52bc8faf000949fbc0b83c08aca36e58 (patch)
treeb79a84f51920aef004cce27eb9e1fdbf16677e25 /chrome/test
parent9ec3d3d9c99059472f9a758b36707c504f568f9c (diff)
downloadchromium_src-c56002eb52bc8faf000949fbc0b83c08aca36e58.zip
chromium_src-c56002eb52bc8faf000949fbc0b83c08aca36e58.tar.gz
chromium_src-c56002eb52bc8faf000949fbc0b83c08aca36e58.tar.bz2
AutomatedUITestBase.CloseTab fails on multiple platforms, not
just windows. see http://build.chromium.org/buildbot/waterfall/builders/Linux%20Tests%20(dbg)(2)/builds/3796/steps/ui_tests/logs/CloseTab BUG:14774 Review URL: http://codereview.chromium.org/346005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_test.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
index 1422038..c913717 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -24,13 +24,6 @@
DISABLED_OpenCloseBrowserWindowWithAccelerator
#endif
-// http://code.google.com/p/chromium/issues/detail?id=14774
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_CloseTab DISABLED_CloseTab
-#else
-#define MAYBE_CloseTab CloseTab
-#endif
-
// Automation pieces are not implemented for these on platforms other than
// Windows.
#if defined(OS_WIN)
@@ -111,7 +104,8 @@ TEST_F(AutomatedUITestBase, DISABLED_RestoreTab) {
ASSERT_EQ(2, tab_count);
}
-TEST_F(AutomatedUITestBase, MAYBE_CloseTab) {
+// http://code.google.com/p/chromium/issues/detail?id=14774
+TEST_F(AutomatedUITestBase, FLAKY_CloseTab) {
int num_browser_windows;
int tab_count;
NewTab();