Title: [121842] trunk/LayoutTests
- Revision
- 121842
- Author
- [email protected]
- Date
- 2012-07-04 05:32:57 -0700 (Wed, 04 Jul 2012)
Log Message
REGRESSION(r121792): inspector/extensions/extensions-resources.html fails
https://bugs.webkit.org/show_bug.cgi?id=90530
Reviewed by Pavel Feldman.
* http/tests/inspector/debugger-test.js:
(initialize_DebuggerTest.InspectorTest.finishDebuggerTest.disableDebugger):
(initialize_DebuggerTest.InspectorTest.finishDebuggerTest.debuggerDisabled):
(initialize_DebuggerTest.InspectorTest.finishDebuggerTest):
(initialize_DebuggerTest.InspectorTest.completeDebuggerTest.completeTest):
(initialize_DebuggerTest.InspectorTest.completeDebuggerTest):
* inspector/extensions/extensions-resources-expected.txt:
* inspector/extensions/extensions-resources.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121841 => 121842)
--- trunk/LayoutTests/ChangeLog 2012-07-04 12:09:52 UTC (rev 121841)
+++ trunk/LayoutTests/ChangeLog 2012-07-04 12:32:57 UTC (rev 121842)
@@ -1,3 +1,19 @@
+2012-07-04 Vsevolod Vlasov <[email protected]>
+
+ REGRESSION(r121792): inspector/extensions/extensions-resources.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=90530
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/debugger-test.js:
+ (initialize_DebuggerTest.InspectorTest.finishDebuggerTest.disableDebugger):
+ (initialize_DebuggerTest.InspectorTest.finishDebuggerTest.debuggerDisabled):
+ (initialize_DebuggerTest.InspectorTest.finishDebuggerTest):
+ (initialize_DebuggerTest.InspectorTest.completeDebuggerTest.completeTest):
+ (initialize_DebuggerTest.InspectorTest.completeDebuggerTest):
+ * inspector/extensions/extensions-resources-expected.txt:
+ * inspector/extensions/extensions-resources.html:
+
2012-07-04 Zan Dobersek <[email protected]>
Unreviewed GTK gardening, updating baselines after r121789.
Modified: trunk/LayoutTests/http/tests/inspector/debugger-test.js (121841 => 121842)
--- trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-07-04 12:09:52 UTC (rev 121841)
+++ trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-07-04 12:32:57 UTC (rev 121842)
@@ -22,7 +22,7 @@
}
};
-InspectorTest.completeDebuggerTest = function()
+InspectorTest.finishDebuggerTest = function(callback)
{
var scriptsPanel = WebInspector.panels.scripts;
@@ -34,18 +34,23 @@
if (!scriptsPanel._debuggerEnabled)
completeTest();
else {
- InspectorTest.addSniffer(WebInspector.debuggerModel, "_debuggerWasDisabled", completeTest);
+ InspectorTest.addSniffer(WebInspector.debuggerModel, "_debuggerWasDisabled", debuggerDisabled);
scriptsPanel.toggleDebugging(false);
}
}
- function completeTest()
+ function debuggerDisabled()
{
InspectorTest.addResult("Debugger was disabled.");
- InspectorTest.completeTest();
+ callback();
}
};
+InspectorTest.completeDebuggerTest = function()
+{
+ InspectorTest.finishDebuggerTest(InspectorTest.completeTest.bind(InspectorTest));
+};
+
InspectorTest.runDebuggerTestSuite = function(testSuite)
{
var testSuiteTests = testSuite.slice();
Modified: trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt (121841 => 121842)
--- trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt 2012-07-04 12:09:52 UTC (rev 121841)
+++ trunk/LayoutTests/inspector/extensions/extensions-resources-expected.txt 2012-07-04 12:32:57 UTC (rev 121842)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 11: don't panic!
+CONSOLE MESSAGE: line 12: don't panic!
Tests resource-related methods of WebInspector extension API
@@ -60,6 +60,7 @@
content committed for resource .../audits-style1.css (type: stylesheet), new content: div.test { width: 220px; height: 42px; }
Revision content: div.test { width: 220px; height: 42px; }
RUNNING TEST: extension_testOnResourceAdded
+Debugger was enabled.
resource added:
{
0 : {
@@ -69,6 +70,7 @@
setContent : <function>
}
}
+Debugger was disabled.
RUNNING TEST: extension_testOpenResourceHandler
handleOpenResource() invoked [this should only appear once!]:
{
@@ -78,7 +80,7 @@
getContent : <function>
setContent : <function>
}
- 1 : 11
+ 1 : 12
}
RUNNING TEST: extension_testSetResourceContent
div.test width after stylesheet edited (should be 126): 126
Modified: trunk/LayoutTests/inspector/extensions/extensions-resources.html (121841 => 121842)
--- trunk/LayoutTests/inspector/extensions/extensions-resources.html 2012-07-04 12:09:52 UTC (rev 121841)
+++ trunk/LayoutTests/inspector/extensions/extensions-resources.html 2012-07-04 12:32:57 UTC (rev 121842)
@@ -2,6 +2,7 @@
<head>
<script src=""
<script src=""
+<script src=""
<link rel="stylesheet" href="" type="text/css">
<script type="text/_javascript_" src=""
@@ -158,16 +159,24 @@
function extension_testOnResourceAdded(nextTest)
{
+ evaluateOnFrontend("InspectorTest.startDebuggerTest(reply);", step2);
+
+ function step2()
+ {
+ webInspector.inspectedWindow.onResourceAdded.addListener(onResourceAdded);
+ webInspector.inspectedWindow.eval("addResource()");
+ }
+
function onResourceAdded(resource)
{
+ if (resource.url.indexOf("test_func") === -1)
+ return;
output("resource added:");
dumpObject(Array.prototype.slice.call(arguments), { url: "url" });
webInspector.inspectedWindow.onResourceAdded.removeListener(onResourceAdded);
- nextTest();
+ evaluateOnFrontend("InspectorTest.finishDebuggerTest(reply);", nextTest);
}
- webInspector.inspectedWindow.onResourceAdded.addListener(onResourceAdded);
- webInspector.inspectedWindow.eval("addResource()");
}
function extension_testOpenResourceHandler(nextTest)
Modified: trunk/LayoutTests/platform/qt/Skipped (121841 => 121842)
--- trunk/LayoutTests/platform/qt/Skipped 2012-07-04 12:09:52 UTC (rev 121841)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-07-04 12:32:57 UTC (rev 121842)
@@ -2536,6 +2536,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=90165
css3/filters/huge-region-composited.html
-# REGRESSION(r121792): inspector/extensions/extensions-resources.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=90530
-inspector/extensions/extensions-resources.html
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
