diff options
| author | sergeyv@chromium.org <sergeyv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 17:16:01 +0000 |
|---|---|---|
| committer | sergeyv@chromium.org <sergeyv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 17:16:01 +0000 |
| commit | ebb10bb4a98fd35f452a2def2722875844926402 (patch) | |
| tree | f4e8a31789c5d647409665d45c7d64b638e0ea94 | |
| parent | 2fc9a7b675786ecc50fdd8713599131ae76fc70b (diff) | |
| download | chromium_src-ebb10bb4a98fd35f452a2def2722875844926402.zip chromium_src-ebb10bb4a98fd35f452a2def2722875844926402.tar.gz chromium_src-ebb10bb4a98fd35f452a2def2722875844926402.tar.bz2 | |
DevTools: Fix flaky reattachAfterCrash test
Blink part of this patch: https://codereview.chromium.org/238443011/
BUG=163411
Review URL: https://codereview.chromium.org/239543007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264233 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/devtools/devtools_sanity_browsertest.cc | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index b2a4778..0272c38 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -859,28 +859,10 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsExternalNavigation) { CloseDevToolsWindow(); } -#if defined(OS_WIN) || defined(OS_MACOSX) -// Flakily times out: http://crbug.com/163411 -#define MAYBE_TestReattachAfterCrash DISABLED_TestReattachAfterCrash -#else -#define MAYBE_TestReattachAfterCrash TestReattachAfterCrash -#endif // Tests that inspector will reattach to inspected page when it is reloaded // after a crash. See http://crbug.com/101952 -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestReattachAfterCrash) { - OpenDevToolsWindow(kDebuggerTestPage, false); - - content::CrashTab(GetInspectedTab()); - content::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, - content::Source<NavigationController>( - &browser()->tab_strip_model()->GetActiveWebContents()-> - GetController())); - chrome::Reload(browser(), CURRENT_TAB); - observer.Wait(); - - RunTestFunction(window_, "testReattachAfterCrash"); - CloseDevToolsWindow(); +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) { + RunTest("testReattachAfterCrash", std::string()); } IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { |