Commit 58bea862 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Disable IframeBeforeUnloadParentHang on Linux TSAN.

Disabling this RenderFrameHostImplBrowserTest on this configuration as
it's frequently hanging and blocking the CQ.

BUG=795326
TBR=avi@chromium.org

Change-Id: I88e5b4158de3c92113b767b00b64d88e11ae09ca
Reviewed-on: https://chromium-review.googlesource.com/831127Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524544}
parent cdb0ee19
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/test/mock_callback.h" #include "base/test/mock_callback.h"
#include "build/build_config.h"
#include "content/browser/frame_host/navigation_handle_impl.h" #include "content/browser/frame_host/navigation_handle_impl.h"
#include "content/browser/interface_provider_filtering.h" #include "content/browser/interface_provider_filtering.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
...@@ -277,8 +278,14 @@ class DropBeforeUnloadACKFilter : public BrowserMessageFilter { ...@@ -277,8 +278,14 @@ class DropBeforeUnloadACKFilter : public BrowserMessageFilter {
// Tests that a beforeunload dialog in an iframe doesn't stop the beforeunload // Tests that a beforeunload dialog in an iframe doesn't stop the beforeunload
// timer of a parent frame. // timer of a parent frame.
// TODO(avi): flaky on Linux TSAN: http://crbug.com/795326
#if defined(OS_LINUX) && defined(THREAD_SANITIZER)
#define MAYBE_IframeBeforeUnloadParentHang DISABLED_IframeBeforeUnloadParentHang
#else
#define MAYBE_IframeBeforeUnloadParentHang IframeBeforeUnloadParentHang
#endif
IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest, IN_PROC_BROWSER_TEST_F(RenderFrameHostImplBrowserTest,
IframeBeforeUnloadParentHang) { MAYBE_IframeBeforeUnloadParentHang) {
WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents()); WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
TestJavaScriptDialogManager dialog_manager; TestJavaScriptDialogManager dialog_manager;
wc->SetDelegate(&dialog_manager); wc->SetDelegate(&dialog_manager);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment