summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 08:52:55 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 08:52:55 +0000
commit7dcd23acf719fe48b33ac2c47c8dbff31a9e44c6 (patch)
treea322770acb32f3e8bd276d554b26cfaa6edde737
parentb62de6b223ad59c0183fb0890f27121c7d24d852 (diff)
downloadchromium_src-7dcd23acf719fe48b33ac2c47c8dbff31a9e44c6.zip
chromium_src-7dcd23acf719fe48b33ac2c47c8dbff31a9e44c6.tar.gz
chromium_src-7dcd23acf719fe48b33ac2c47c8dbff31a9e44c6.tar.bz2
blacklist some more tests in single process
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10146 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/unload_uitest.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index bb0119b2..947a2a5 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -246,6 +246,11 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
// Tests closing the browser with a beforeunload handler that takes
// two seconds to run.
TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) {
+ // TODO(jabdelmalek): BUG(7933) this started hanging now, should it be
+ // disabled in single process mode like the other tests?
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ return;
+
LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_HTML,
L"twosecondbeforeunload");
}
@@ -297,12 +302,22 @@ TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnloadAlert) {
// Tests closing the browser on a page with an unload listener registered where
// the unload handler has an 2 second long loop followed by an alert.
TEST_F(UnloadTest, BrowserCloseTwoSecondUnloadAlert) {
+ // TODO(jabdelmalek): BUG(7933) this started hanging now, should it be
+ // disabled in single process mode like the other tests?
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ return;
+
LoadUrlAndQuitBrowser(TWO_SECOND_UNLOAD_ALERT_HTML, L"twosecondunloadalert");
}
// Tests closing the browser with a beforeunload handler that takes
// two seconds to run then pops up an alert.
TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) {
+ // TODO(jabdelmalek): BUG(7933) this started hanging now, should it be
+ // disabled in single process mode like the other tests?
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ return;
+
LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_ALERT_HTML,
L"twosecondbeforeunloadalert");
}