Changeset 76020 in webkit

Timestamp:

Jan 18, 2011 6:09:35 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-01-18 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: fix flaky debugger tests.
​https://bugs.webkit.org/show_bug.cgi?id=51320

• http/tests/inspector/debugger-test2.js: (initialize_DebuggerTest.InspectorTest.setBreakpoint): (initialize_DebuggerTest.InspectorTest.showScriptSource): (initialize_DebuggerTest.InspectorTest._showScriptSource):
• inspector/debugger-pause-on-breakpoint-expected.txt:
• inspector/debugger-pause-on-breakpoint.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/debugger-test2.js (modified) (3 diffs)
• inspector/debugger-breakpoints-not-activated-on-reload.html (modified) (1 diff)
• inspector/debugger-pause-on-breakpoint-expected.txt (modified) (1 diff)
• inspector/debugger-pause-on-breakpoint.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-18  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: fix flaky debugger tests.
+        https://bugs.webkit.org/show_bug.cgi?id=51320
+
+        * http/tests/inspector/debugger-test2.js:
+        (initialize_DebuggerTest.InspectorTest.setBreakpoint):
+        (initialize_DebuggerTest.InspectorTest.showScriptSource):
+        (initialize_DebuggerTest.InspectorTest._showScriptSource):
+        * inspector/debugger-pause-on-breakpoint-expected.txt:
+        * inspector/debugger-pause-on-breakpoint.html:
+
 2011-01-18  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/http/tests/inspector/debugger-test2.js

@@ -94 +94 @@
 {
     var scripts = WebInspector.debuggerModel.scriptsForURL(url);
-    if (scripts.length) {
-        WebInspector.debuggerModel.setBreakpoint(scripts[0].sourceID, lineNumber, enabled, condition);
-        callback();
-    } else {
-        var handler = InspectorTest.setBreakpoint.bind(InspectorTest, url, lineNumber, enabled, condition, callback);
-        InspectorTest._addSniffer(WebInspector.debuggerModel, "_parsedScriptSource", handler);
-    }
+    for (var i = 0; i < scripts.length; ++i)
+        WebInspector.debuggerModel.setBreakpoint(scripts[i].sourceID, lineNumber, enabled, condition);
 }
 
@@ -127 +122 @@
 InspectorTest.showScriptSource = function(scriptName, callback)
 {
-    if (InspectorTest._scriptsAreParsed([scriptName])) {
-        var scriptOrResource = InspectorTest._showScriptSource(scriptName);
-        callback(scriptOrResource.sourceFrame);
-    } else
+    if (InspectorTest._scriptsAreParsed([scriptName]))
+        InspectorTest._showScriptSource(scriptName, callback);
+     else
         InspectorTest._addSniffer(WebInspector.debuggerModel, "_parsedScriptSource", InspectorTest.showScriptSource.bind(InspectorTest, scriptName, callback));
 };
@@ -175 +169 @@
         scriptsPanel._showScriptOrResource(scriptResource);
     }
-    return scriptResource;
+
+    var sourceFrame = WebInspector.currentPanel.visibleView.sourceFrame;
+    if (sourceFrame._content)
+        callback(sourceFrame);
+    else
+        InspectorTest._addSniffer(sourceFrame._textModel, "setText", callback.bind(null, sourceFrame));
 };
 

trunk/LayoutTests/inspector/debugger-breakpoints-not-activated-on-reload.html

@@ -25 +25 @@
     {
         InspectorTest.addResult("Main resource was shown.");
-        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 8, true, "", step3);
+        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 8, true, "");
+        WebInspector.panels.scripts.toggleBreakpointsButton.element.click();
+        InspectorTest.reloadPage(step4);
     }
 
     function step3()
     {
-        WebInspector.panels.scripts.toggleBreakpointsButton.element.click();
-        InspectorTest.reloadPage(step4);
+        InspectorTest.showScriptSource(testName, step4);
     }
 
     function step4()
-    {
-        InspectorTest.showScriptSource(testName, step5);
-    }
-
-    function step5()
     {
         InspectorTest.addResult("Main resource was shown.");

trunk/LayoutTests/inspector/debugger-pause-on-breakpoint-expected.txt

@@ -2 +2 @@
 
 Debugger was enabled.
+Script source was shown.
 Set timer for test function.
 Script execution paused.

trunk/LayoutTests/inspector/debugger-pause-on-breakpoint.html

@@ -17 +17 @@
     function step1()
     {
-        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 9, true, "", step2);
+        InspectorTest.showScriptSource("debugger-pause-on-breakpoint.html", step2);
     }
 
     function step2()
     {
+        InspectorTest.addResult("Script source was shown.");
+        InspectorTest.setBreakpoint(WebInspector.mainResource.url, 9, true, "");
         InspectorTest.runTestFunctionAndWaitUntilPaused(step3);
     }