summaryrefslogtreecommitdiffstats
path: root/chrome/browser/lifetime/browser_close_manager_browsertest.cc
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 08:42:49 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-03 08:42:49 +0000
commit8376e175ea4f492699daabdb8df78516009fd4cd (patch)
tree44538742434c18febd3d91e2625eb65e18714dae /chrome/browser/lifetime/browser_close_manager_browsertest.cc
parent993b876f02f8485039202c55fb4531aabc6c3f50 (diff)
downloadchromium_src-8376e175ea4f492699daabdb8df78516009fd4cd.zip
chromium_src-8376e175ea4f492699daabdb8df78516009fd4cd.tar.gz
chromium_src-8376e175ea4f492699daabdb8df78516009fd4cd.tar.bz2
Disable BrowserCloseManagerBrowserTest.TestHangInBeforeUnloadMultipleTabs on Windows - flaky
TBR=sammc@chromium.org BUG=276366 Review URL: https://codereview.chromium.org/25840003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/lifetime/browser_close_manager_browsertest.cc')
-rw-r--r--chrome/browser/lifetime/browser_close_manager_browsertest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 0aaa132..7b39cd7 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -549,8 +549,16 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
EXPECT_TRUE(chrome::BrowserIterator().done());
}
+// Test is flaky on windows, disabled. See http://crbug.com/276366
+#if defined(OS_WIN)
+#define MAYBE_TestOpenAndCloseWindowDuringShutdown \
+ DISABLED_TestOpenAndCloseWindowDuringShutdown
+#else
+#define MAYBE_TestOpenAndCloseWindowDuringShutdown \
+ TestOpenAndCloseWindowDuringShutdown
+#endif
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
- TestOpenAndCloseWindowDuringShutdown) {
+ MAYBE_TestOpenAndCloseWindowDuringShutdown) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));