diff options
author | Erik Arvidsson <arv@chromium.org> | 2014-09-03 12:23:30 -0400 |
---|---|---|
committer | Erik Arvidsson <arv@chromium.org> | 2014-09-03 16:30:09 +0000 |
commit | aa68220c9f12f483f23c568bc6962b6bc88af38b (patch) | |
tree | acb0a2d8d1f09b5b0f73f47622b0ad07eb8b47a3 /chrome/browser/devtools | |
parent | a4afac27818dfb1d25d77a4f9a505095156032e9 (diff) | |
download | chromium_src-aa68220c9f12f483f23c568bc6962b6bc88af38b.zip chromium_src-aa68220c9f12f483f23c568bc6962b6bc88af38b.tar.gz chromium_src-aa68220c9f12f483f23c568bc6962b6bc88af38b.tar.bz2 |
Disable DevToolsUnresponsiveBeforeUnloadTest.TestUndockedDevToolsUnresponsive on Windows and Linux
BUG=410327
TBR=tkent,rvargas
Review URL: https://codereview.chromium.org/539473004
Cr-Commit-Position: refs/heads/master@{#293147}
Diffstat (limited to 'chrome/browser/devtools')
-rw-r--r-- | chrome/browser/devtools/devtools_sanity_browsertest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 7c2489c..5ede515 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -571,11 +571,19 @@ IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, &chrome::CloseAllBrowsers)); } +// Times out on Win and Linux +// @see http://crbug.com/410327 +#if defined(OS_WIN) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#define MAYBE_TestUndockedDevToolsUnresponsive DISABLED_TestUndockedDevToolsUnresponsive +#else +#define MAYBE_TestUndockedDevToolsUnresponsive TestUndockedDevToolsUnresponsive +#endif + // Tests that inspected tab gets closed if devtools renderer // becomes unresponsive during beforeunload event interception. // @see http://crbug.com/322380 IN_PROC_BROWSER_TEST_F(DevToolsUnresponsiveBeforeUnloadTest, - TestUndockedDevToolsUnresponsive) { + MAYBE_TestUndockedDevToolsUnresponsive) { ASSERT_TRUE(test_server()->Start()); LoadTestPage(kDebuggerTestPage); DevToolsWindow* devtools_window = OpenDevToolWindowOnWebContents( |