summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup/shutdown_test.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 18:00:11 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 18:00:11 +0000
commit6c839abede371ab02416fa3d1158c7b05844e220 (patch)
tree950ba02cfaf42daa057c0bdc00b7349032dd27bb /chrome/test/startup/shutdown_test.cc
parent9785bf9e2a457749c62c9fe3f9351a918d43c372 (diff)
downloadchromium_src-6c839abede371ab02416fa3d1158c7b05844e220.zip
chromium_src-6c839abede371ab02416fa3d1158c7b05844e220.tar.gz
chromium_src-6c839abede371ab02416fa3d1158c7b05844e220.tar.bz2
Temporarily disable ShutdownTest.TwentyTabsSessionEnding on Windows.
It's making Windows Perf startup_tests red. BUG=40671 TEST=greener bot TBR=thestig@chromium.org Review URL: http://codereview.chromium.org/1599022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup/shutdown_test.cc')
-rw-r--r--chrome/test/startup/shutdown_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc
index fcb620a..254fe16 100644
--- a/chrome/test/startup/shutdown_test.cc
+++ b/chrome/test/startup/shutdown_test.cc
@@ -113,7 +113,13 @@ TEST_F(ShutdownTest, TwentyTabsUserQuit) {
true, /* important */ UITest::USER_QUIT);
}
-TEST_F(ShutdownTest, TwentyTabsSessionEnding) {
+// http://crbug.com/40671
+#if defined(OS_WIN)
+#define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding
+#else
+#define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding
+#endif
+TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) {
SetUpTwentyTabs();
RunShutdownTest("shutdown", "twentytabs-session-ending",
true, /* important */ UITest::SESSION_ENDING);