Diff
Modified: trunk/LayoutTests/ChangeLog (97889 => 97890)
--- trunk/LayoutTests/ChangeLog 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/ChangeLog 2011-10-19 23:02:57 UTC (rev 97890)
@@ -1,3 +1,21 @@
+2011-10-19 Dirk Pranke <[email protected]>
+
+ Unreviewed, rolling out r97850.
+ http://trac.webkit.org/changeset/97850
+ https://bugs.webkit.org/show_bug.cgi?id=70334
+
+ tests are crashing on xp debug
+
+ * http/tests/inspector/extensions-headers.html:
+ * http/tests/inspector/resources/extension-main.js:
+ ():
+ * inspector/extensions/extensions-audits.html:
+ * inspector/extensions/extensions-console.html:
+ * inspector/extensions/extensions-resources.html:
+ * platform/chromium/inspector/extensions/extensions-api-expected.txt: Removed.
+ * platform/chromium/inspector/extensions/extensions-eval-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+
2011-10-19 Erik Arvidsson <[email protected]>
[Chromium] Update the test expectations for r97881.
Modified: trunk/LayoutTests/http/tests/inspector/extensions-headers.html (97889 => 97890)
--- trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/http/tests/inspector/extensions-headers.html 2011-10-19 23:02:57 UTC (rev 97890)
@@ -6,13 +6,13 @@
function extension_testAddHeaders(nextTest)
{
- webInspector.network.addRequestHeaders({
+ webInspector.resources.addRequestHeaders({
"x-webinspector-extension": "test",
"user-agent": "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)"
});
function cleanUpHeaders()
{
- webInspector.network.addRequestHeaders({
+ webInspector.resources.addRequestHeaders({
"x-webinspector-extension": null,
"user-agent": null
});
Modified: trunk/LayoutTests/http/tests/inspector/resources/extension-main.js (97889 => 97890)
--- trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/http/tests/inspector/resources/extension-main.js 2011-10-19 23:02:57 UTC (rev 97890)
@@ -50,9 +50,7 @@
channel.port1.start();
if (callback)
channel.port1.addEventListener("message", callbackWrapper, false);
- webInspector.inspectedWindow.eval("", function() {
- top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
- });
+ top.postMessage({ _expression_: _expression_ }, [ channel.port2 ], "*");
}
function output(message)
Modified: trunk/LayoutTests/inspector/extensions/extensions-audits.html (97889 => 97890)
--- trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/inspector/extensions/extensions-audits.html 2011-10-19 23:02:57 UTC (rev 97890)
@@ -20,7 +20,7 @@
var nestedNode = node.addChild("... and a snippet");
nestedNode.expanded = true;
nestedNode.addChild(results.createSnippet("function rand()\n{\n return 4;\n}"));
- nestedNode.addChild(results.createResourceLink("file:///path/to/error.html", 10));
+ nestedNode.addChild(results.createResourceLink('file:///path/to/error.html', 10));
results.addResult("Rule with details subtree (1)", "This rule has a lot of details", results.Severity.Warning, node);
// Audit normally terminates when number of added rule results is equal to
@@ -35,7 +35,7 @@
}
function onStartAuditDisabledCategory(results)
{
- output("FAIL: disabledCategory.onAuditStarted fired");
+ output("FAIL: failedCategory.onAuditStarted fired");
results.done();
}
@@ -49,9 +49,7 @@
var disabledCategory = webInspector.audits.addCategory("Disabled extension audits", 2);
disabledCategory.onAuditStarted.addListener(onStartAuditDisabledCategory);
- webInspector.inspectedWindow.eval("", function() {
- extension_runAudits(nextTest);
- });
+ extension_runAudits(nextTest);
}
</script>
Modified: trunk/LayoutTests/inspector/extensions/extensions-console.html (97889 => 97890)
--- trunk/LayoutTests/inspector/extensions/extensions-console.html 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/inspector/extensions/extensions-console.html 2011-10-19 23:02:57 UTC (rev 97890)
@@ -5,6 +5,7 @@
<script src=""
<script type="text/_javascript_">
+
function extension_testGetConsoleMessages(nextTest)
{
function callback(messages)
@@ -12,6 +13,7 @@
dumpObject(messages, { url: "url" });
}
webInspector.console.getMessages(callbackAndNextTest(callback, nextTest));
+
}
function extension_testAddConsoleMessages(nextTest)
@@ -20,9 +22,7 @@
webInspector.console.addMessage(webInspector.console.Severity.Log, "log message from extension", "test-url.html", 42);
webInspector.console.addMessage(webInspector.console.Severity.Warning, "warning message from extension");
webInspector.console.addMessage(webInspector.console.Severity.Error, "error message from extension", null, 42);
- webInspector.inspectedWindow.eval("", function() {
- evaluateOnFrontend("InspectorTest.dumpConsoleMessagesWithClasses(); reply();", nextTest);
- });
+ evaluateOnFrontend("InspectorTest.dumpConsoleMessagesWithClasses(); reply();", nextTest)
}
function extension_testOnConsoleMessageAdded(nextTest)
Modified: trunk/LayoutTests/inspector/extensions/extensions-resources.html (97889 => 97890)
--- trunk/LayoutTests/inspector/extensions/extensions-resources.html 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/inspector/extensions/extensions-resources.html 2011-10-19 23:02:57 UTC (rev 97890)
@@ -95,8 +95,8 @@
});
// The next step is going to produce a console message that will be logged, so synchronize the output now.
evaluateOnFrontend("InspectorTest.runAfterPendingDispatches(reply)", function() {
- extension_runWithResource(/abe\.png$/, function(resource) {
- resource.setContent("", true);
+ extension_runWithResource(/test-script\.js$/, function(resource) {
+ resource.setContent("function function1(){}", true);
});
extension_runWithResource(/audits-style1\.css$/, function(resource) {
resource.setContent(expected_content, true);
@@ -137,7 +137,7 @@
function addResource()
{
var script = document.createElement("script");
- script.src = "" + escape("function test_func(){};");
+ script.src = "" test_func(){}";
document.head.appendChild(script);
}
Deleted: trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt (97889 => 97890)
--- trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-api-expected.txt 2011-10-19 23:02:57 UTC (rev 97890)
@@ -1,103 +0,0 @@
-Tests public interface of WebInspector Extensions API
-
-Started extension.
-Running tests...
-RUNNING TEST: extension_testAPI
-{
- audits : {
- addCategory : <function>
- }
- inspectedWindow : {
- onResourceAdded : {
- addListener : <function>
- removeListener : <function>
- }
- onResourceContentCommitted : {
- addListener : <function>
- removeListener : <function>
- }
- reload : <function>
- eval : <function>
- getResources : <function>
- tabId : undefined
- }
- panels : {
- elements : {
- onShown : {
- addListener : <function>
- removeListener : <function>
- }
- onHidden : {
- addListener : <function>
- removeListener : <function>
- }
- createSidebarPane : <function>
- onSelectionChanged : {
- addListener : <function>
- removeListener : <function>
- }
- }
- create : <function>
- setOpenResourceHandler : <function>
- }
- network : {
- onRequestFinished : {
- addListener : <function>
- removeListener : <function>
- }
- onFinished : {
- addListener : <function>
- removeListener : <function>
- }
- onNavigated : {
- addListener : <function>
- removeListener : <function>
- }
- getHAR : <function>
- addRequestHeaders : <function>
- }
- resources : {
- onRequestFinished : {
- addListener : <function>
- removeListener : <function>
- }
- onFinished : {
- addListener : <function>
- removeListener : <function>
- }
- onNavigated : {
- addListener : <function>
- removeListener : <function>
- }
- getHAR : <function>
- addRequestHeaders : <function>
- }
- timeline : {
- onEventRecorded : {
- addListener : <function>
- removeListener : <function>
- }
- }
- console : {
- onMessageAdded : {
- addListener : <function>
- removeListener : <function>
- }
- getMessages : <function>
- addMessage : <function>
- Severity : {
- Tip : "tip"
- Debug : "debug"
- Log : "log"
- Warning : "warning"
- Error : "error"
- }
- }
- onReset : {
- addListener : <function>
- removeListener : <function>
- }
- log : <function>
-}
-All tests done.
-
Deleted: trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-eval-expected.txt (97889 => 97890)
--- trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-eval-expected.txt 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/platform/chromium/inspector/extensions/extensions-eval-expected.txt 2011-10-19 23:02:57 UTC (rev 97890)
@@ -1,18 +0,0 @@
-Tests WebInspector extension API
-
-Started extension.
-Running tests...
-RUNNING TEST: extension_testEvalConsoleAPI
-Evaluate: "function" (exception: undefined)
-RUNNING TEST: extension_testEvalDefinesGlobalSymbols
-Evaluate: {"func":"function","variable":42} (exception: undefined)
-RUNNING TEST: extension_testEvalFailed
-Evaluate: "TypeError: Converting circular structure to JSON" (exception: true)
-RUNNING TEST: extension_testEvalOk
-Evaluate: {"str":"foo","num":42} (exception: undefined)
-RUNNING TEST: extension_testEvalStatement
-Evaluate: 0 (exception: undefined)
-RUNNING TEST: extension_testEvalUndefined
-Evaluate: undefined (exception: undefined)
-All tests done.
-
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (97889 => 97890)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-10-19 23:02:57 UTC (rev 97890)
@@ -587,6 +587,12 @@
// Inspector tests
// -----------------------------------------------------------------
+// There is no message port harness to test extensions
+WONTFIX SKIP : inspector/extensions = FAIL
+WONTFIX SKIP : http/tests/inspector/extensions-headers.html = FAIL
+WONTFIX SKIP : http/tests/inspector/extensions-network-redirect.html = FAIL
+WONTFIX SKIP : http/tests/inspector/extensions-useragent.html = FAIL
+
// There is no enough plugins support in DRT
WONTFIX SKIP : http/tests/inspector/network/network-embed.html = FAIL
WONTFIX SKIP : http/tests/inspector/network/network-content-replacement-embed.html = FAIL
Modified: trunk/Source/WebKit/chromium/ChangeLog (97889 => 97890)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-19 23:02:57 UTC (rev 97890)
@@ -1,3 +1,13 @@
+2011-10-19 Dirk Pranke <[email protected]>
+
+ Unreviewed, rolling out r97850.
+ http://trac.webkit.org/changeset/97850
+ https://bugs.webkit.org/show_bug.cgi?id=70334
+
+ tests are crashing on xp debug
+
+ * DEPS:
+
2011-10-19 Andrey Kosyakov <[email protected]>
Web Inspector: make extension tests pass on chromium
Modified: trunk/Source/WebKit/chromium/DEPS (97889 => 97890)
--- trunk/Source/WebKit/chromium/DEPS 2011-10-19 22:54:44 UTC (rev 97889)
+++ trunk/Source/WebKit/chromium/DEPS 2011-10-19 23:02:57 UTC (rev 97890)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '106056'
+ 'chromium_rev': '105970'
}
deps = {
