summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 18:37:18 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 18:37:18 +0000
commit743da5658a9672257082a9c30c6ac528e4a7a1f2 (patch)
tree386a5d94a62c939e7a95bbf0a07b5fc8270faf29
parent77ed5014b883ef7e170be208f5af6a5cb1e5a8c9 (diff)
downloadchromium_src-743da5658a9672257082a9c30c6ac528e4a7a1f2.zip
chromium_src-743da5658a9672257082a9c30c6ac528e4a7a1f2.tar.gz
chromium_src-743da5658a9672257082a9c30c6ac528e4a7a1f2.tar.bz2
Mark OpenCloseBrowserWindowWithAccelerator as FLAKY on win
BUG=96039 TEST=AutomatedUITestBase.OpenCloseBrowserWindowWithAccelerator Review URL: http://codereview.chromium.org/7867001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100447 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_test.cc11
1 files changed, 10 insertions, 1 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 d5f2a94..7f216fd 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc
@@ -237,7 +237,16 @@ TEST_F(AutomatedUITestBase, IncognitoWindow) {
ASSERT_EQ(1, num_browser_windows);
}
-TEST_F(AutomatedUITestBase, OpenCloseBrowserWindowWithAccelerator) {
+// Flaky, see http://crbug.com/96039.
+#if defined(OS_WIN)
+#define MAYBE_OpenCloseBrowserWindowWithAccelerator \
+ FLAKY_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.