summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 20:39:32 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-02 20:39:32 +0000
commit8d54beb2e146f6cbbd809f93a0e2e83ba4881d09 (patch)
tree1c5752279c4684c1f3745229b5337d3c0b651863 /chrome
parentb5884ab0ec66c3a4d6073fba07e6f0da42e22f22 (diff)
downloadchromium_src-8d54beb2e146f6cbbd809f93a0e2e83ba4881d09.zip
chromium_src-8d54beb2e146f6cbbd809f93a0e2e83ba4881d09.tar.gz
chromium_src-8d54beb2e146f6cbbd809f93a0e2e83ba4881d09.tar.bz2
Revert 112688 - DevTools: remove devtools interactive tests suppressions.
BUG=106114 Review URL: http://codereview.chromium.org/8770038 TBR=pfeldman@chromium.org Review URL: http://codereview.chromium.org/8775068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 695ac74..ca45855 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -452,8 +452,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
// Tests that debugger works correctly if pause event occurs when DevTools
// frontend is being loaded.
+// http://crbug.com/106114
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
- TestPauseWhenLoadingDevTools) {
+ DISABLED_TestPauseWhenLoadingDevTools) {
RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools);
}
@@ -543,8 +544,11 @@ IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) {
#endif
// See http://crbug.com/100538
+// http://crbug.com/106114 is masking
+// MAYBE_PauseInSharedWorkerInitialization into
+// DISABLED_PauseInSharedWorkerInitialization
IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest,
- MAYBE_PauseInSharedWorkerInitialization) {
+ DISABLED_PauseInSharedWorkerInitialization) {
ASSERT_TRUE(test_server()->Start());
GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage);
ui_test_utils::NavigateToURL(browser(), url);