diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 00:45:48 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 00:45:48 +0000 |
| commit | 5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2 (patch) | |
| tree | 11dceddc5729d6f540cf97f487a311103efd0c34 /chrome/test | |
| parent | 589061000c6ba4ec00c0cd06edd240e07a91f072 (diff) | |
| download | chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.zip chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.tar.gz chromium_src-5c292e2238cbcb8d1bd5f8f604f5f430d0de77d2.tar.bz2 | |
Disable some flaky UI tests in windows Debug.
BUG=14774
TEST=no
Review URL: http://codereview.chromium.org/140032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_test.cc | 13 |
1 files changed, 11 insertions, 2 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 00e641d..f69f542 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc @@ -22,6 +22,15 @@ OpenCloseBrowserWindowWithAccelerator #endif +// http://code.google.com/p/chromium/issues/detail?id=14774 +#if defined(OS_WIN) && !defined(NDEBUG) +#define MAYBE_CloseTab DISABLED_CloseTab +#define MAYBE_CloseBrowserWindow DISABLED_CloseBrowserWindow +#else +#define MAYBE_CloseTab CloseTab +#define MAYBE_CloseBrowserWindow CloseBrowserWindow +#endif + TEST_F(AutomatedUITestBase, NewTab) { int tab_count; active_browser()->GetTabCount(&tab_count); @@ -64,7 +73,7 @@ TEST_F(AutomatedUITestBase, DISABLED_RestoreTab) { ASSERT_EQ(2, tab_count); } -TEST_F(AutomatedUITestBase, CloseTab) { +TEST_F(AutomatedUITestBase, MAYBE_CloseTab) { int num_browser_windows; int tab_count; NewTab(); @@ -154,7 +163,7 @@ TEST_F(AutomatedUITestBase, OpenBrowserWindow) { ASSERT_EQ(1, num_browser_windows); } -TEST_F(AutomatedUITestBase, CloseBrowserWindow) { +TEST_F(AutomatedUITestBase, MAYBE_CloseBrowserWindow) { int tab_count; NewTab(); active_browser()->GetTabCount(&tab_count); |