diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/devtools/js/tests.js | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 237ee83..94ab316 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -290,12 +290,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) { } // Tests scripts panel showing. -// TODO(pfeldman): http://crbug.com/26540 This test fails on Linux. -#if !defined(OS_LINUX) IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { RunTest("testShowScriptsTab", kDebuggerTestPage); } -#endif // Tests that scripts tab is populated with inspected scripts even if it // hadn't been shown by the moment inspected paged refreshed. diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index 862ab2d..db3c8b2 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -431,14 +431,13 @@ TestSuite.prototype.testShowScriptsTab = function() { test.fail('Unexpected parse event: ' + sourceURL); } parsedDebuggerTestPageHtml = true; + if (!WebInspector.panels.scripts.visibleView) { + test.fail('No visible script view: ' + sourceURL); + } } else { test.fail('Unexpected script URL: ' + sourceURL); } - if (!WebInspector.panels.scripts.visibleView) { - test.fail('No visible script view: ' + sourceURL); - } - // There should be two scripts: one for the main page and another // one which is source of console API(see // InjectedScript._ensureCommandLineAPIInstalled). |