Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 1007313002: Devtools: Fix devtoolsSanityTests TestPauseWhenScriptIsRunning & InspectSharedWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/cancelable_callback.h" 6 #include "base/cancelable_callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 759
760 // Tests that debugger works correctly if pause event occurs when DevTools 760 // Tests that debugger works correctly if pause event occurs when DevTools
761 // frontend is being loaded. 761 // frontend is being loaded.
762 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, 762 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
763 TestPauseWhenLoadingDevTools) { 763 TestPauseWhenLoadingDevTools) {
764 RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools); 764 RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools);
765 } 765 }
766 766
767 // Tests that pressing 'Pause' will pause script execution if the script 767 // Tests that pressing 'Pause' will pause script execution if the script
768 // is already running. 768 // is already running.
769 // Disabled because it fails on all trunk official build bots. 769 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
770 // http://crbug.com/467072
771 // Previous condition:
772 // defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
773 // Timing out on linux ARM bot: https://crbug/238453 770 // Timing out on linux ARM bot: https://crbug/238453
774 #define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning 771 #define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning
772 #else
773 #define MAYBE_TestPauseWhenScriptIsRunning TestPauseWhenScriptIsRunning
774 #endif
775 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, 775 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
776 DISABLED_TestPauseWhenScriptIsRunning) { 776 MAYBE_TestPauseWhenScriptIsRunning) {
777 RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning); 777 RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning);
778 } 778 }
779 779
780 // Tests network timing. 780 // Tests network timing.
781 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkTiming) { 781 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkTiming) {
782 RunTest("testNetworkTiming", kSlowTestPage); 782 RunTest("testNetworkTiming", kSlowTestPage);
783 } 783 }
784 784
785 // Tests network size. 785 // Tests network size.
786 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSize) { 786 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSize) {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 ASSERT_TRUE( 866 ASSERT_TRUE(
867 content::ExecuteScriptAndExtractString( 867 content::ExecuteScriptAndExtractString(
868 main_web_contents()->GetRenderViewHost(), 868 main_web_contents()->GetRenderViewHost(),
869 "window.domAutomationController.send(" 869 "window.domAutomationController.send("
870 " '' + (window.uiTests && (typeof uiTests.runTest)));", 870 " '' + (window.uiTests && (typeof uiTests.runTest)));",
871 &result)); 871 &result));
872 ASSERT_EQ("function", result) << "DevTools front-end is broken."; 872 ASSERT_EQ("function", result) << "DevTools front-end is broken.";
873 CloseDevToolsWindow(); 873 CloseDevToolsWindow();
874 } 874 }
875 875
876 // Disabled because it fails on all trunk official build bots. 876 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, InspectSharedWorker) {
877 // http://crbug.com/467072
878 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, DISABLED_InspectSharedWorker) {
879 #if defined(OS_WIN) && defined(USE_ASH) 877 #if defined(OS_WIN) && defined(USE_ASH)
880 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 878 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
881 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 879 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
882 switches::kAshBrowserTests)) 880 switches::kAshBrowserTests))
883 return; 881 return;
884 #endif 882 #endif
885 883
886 RunTest("testSharedWorker", kSharedWorkerTestPage, kSharedWorkerTestWorker); 884 RunTest("testSharedWorker", kSharedWorkerTestPage, kSharedWorkerTestWorker);
887 } 885 }
888 886
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsDisabled, true); 959 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsDisabled, true);
962 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); 960 ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
963 content::WebContents* web_contents = 961 content::WebContents* web_contents =
964 browser()->tab_strip_model()->GetWebContentsAt(0); 962 browser()->tab_strip_model()->GetWebContentsAt(0);
965 scoped_refptr<content::DevToolsAgentHost> agent( 963 scoped_refptr<content::DevToolsAgentHost> agent(
966 content::DevToolsAgentHost::GetOrCreateFor(web_contents)); 964 content::DevToolsAgentHost::GetOrCreateFor(web_contents));
967 DevToolsWindow::OpenDevToolsWindow(web_contents); 965 DevToolsWindow::OpenDevToolsWindow(web_contents);
968 DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(agent.get()); 966 DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(agent.get());
969 ASSERT_FALSE(window); 967 ASSERT_FALSE(window);
970 } 968 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698