diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 05:50:28 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 05:50:28 +0000 |
| commit | ac5e5c0bc688786fd76f95577d0fc1a53351ca0e (patch) | |
| tree | fb913bcb0ed9e49e5dbb3a4741aae9fc6a45c690 /content/browser | |
| parent | 68b7656b9bb0427e08b95986531bd55c942f22ad (diff) | |
| download | chromium_src-ac5e5c0bc688786fd76f95577d0fc1a53351ca0e.zip chromium_src-ac5e5c0bc688786fd76f95577d0fc1a53351ca0e.tar.gz chromium_src-ac5e5c0bc688786fd76f95577d0fc1a53351ca0e.tar.bz2 | |
Disable ResourceDispatcherHostBrowserTest.SyncXMLHttpRequest_DuringUnload on Mac.
ResourceDispatcherHostBrowserTest.SyncXMLHttpRequest_DuringUnload just started timing out consistently on two bots:
http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%281%29/builds/42253
http://build.chromium.org/p/chromium.mac/builders/Mac10.7%20Tests%20%281%29/builds/13928
See the bug for more info
BUG=56264
TEST=Test disabled, tree green.
TBR=hashimoto@chromium.org
Review URL: https://codereview.chromium.org/18664002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_browsertest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index b4370be..124394b 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -191,9 +191,15 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, // Test for bug #1159553 -- A synchronous xhr (whose content-type is // downloadable) would trigger download and hang the renderer process, // if executed while navigating to a new page. -// If this flakes, use http://crbug.com/56264. +// Disabled on Mac: see http://crbug.com/56264 +#if defined(OS_MACOSX) +#define MAYBE_SyncXMLHttpRequest_DuringUnload \ + DISABLED_SyncXMLHttpRequest_DuringUnload +#else +#define MAYBE_SyncXMLHttpRequest_DuringUnload SyncXMLHttpRequest_DuringUnload +#endif IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, - SyncXMLHttpRequest_DuringUnload) { + MAYBE_SyncXMLHttpRequest_DuringUnload) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); BrowserContext::GetDownloadManager( shell()->web_contents()->GetBrowserContext())->AddObserver(this); |