summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjschuh@google.com <jschuh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 22:23:27 +0000
committerjschuh@google.com <jschuh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 22:23:27 +0000
commit52e2670aa8c78c05665779852597a96d80bfbf9e (patch)
tree0ab0bd7b76155d2305be8c1ca613e0b933f7a0cb /chrome
parent15545ba89dfde63ddc5fd0834fa34b1a19dd924a (diff)
downloadchromium_src-52e2670aa8c78c05665779852597a96d80bfbf9e.zip
chromium_src-52e2670aa8c78c05665779852597a96d80bfbf9e.tar.gz
chromium_src-52e2670aa8c78c05665779852597a96d80bfbf9e.tar.bz2
Disabling BrowserInitTest.BlockBadURLs until I can get it to run consistently on the BuildBot systems.
BUG=32804 TEST=None. Review URL: http://codereview.chromium.org/557020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_init_browsertest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/browser_init_browsertest.cc b/chrome/browser/browser_init_browsertest.cc
index ed4bad8..94aa2f2 100644
--- a/chrome/browser/browser_init_browsertest.cc
+++ b/chrome/browser/browser_init_browsertest.cc
@@ -57,9 +57,11 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenURLsPopup) {
}
// Test that we prevent openning potentially dangerous schemes from the
-// command line. Marked FLAKY because browser instance may not start before
-// enumerating the tabs.
-IN_PROC_BROWSER_TEST_F(BrowserInitTest, FLAKY_BlockBadURLs) {
+// command line.
+// jschuh: DISABLED because the process doesn't have sufficient time
+// to start on most BuildBot runs and I don't want to add longer delays to
+// the test. I'll circle back and make this work properly when i get a chance.
+IN_PROC_BROWSER_TEST_F(BrowserInitTest, DISABLED_BlockBadURLs) {
const std::wstring testurlstr(L"http://localhost/");
const GURL testurl(WideToUTF16Hack(testurlstr));
CommandLine cmdline(CommandLine::ARGUMENTS_ONLY);
@@ -72,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, FLAKY_BlockBadURLs) {
BrowserInit::LaunchWithProfile launch(std::wstring(), cmdline);
launch.Launch(browser()->profile(), false);
- // Give the browser a chance to start first.
+ // Give the browser a chance to start first. FIXME(jschuh)
PlatformThread::Sleep(50);
// Skip about:blank in the first tab