[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
caseq at chromium.org
caseq at chromium.org
Wed Dec 22 12:58:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2ee12b2c1d1be39711bfc1f2d453dd34a9f8f8fc
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 16:00:02 2010 +0000
2010-09-03 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
http/tests/inspector/console-xhr-logging.html and http/tests/inspector/resource-har-conversion.html are failing on chromium win bot
Changed MIME type for .js to application/x-javascript for consistency with apache used on other platforms.
https://bugs.webkit.org/show_bug.cgi?id=45137
* Scripts/webkitpy/layout_tests/port/lighttpd.conf:
2010-09-03 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
http/tests/inspector/console-xhr-logging.html and http/tests/inspector/resource-har-conversion.html are failing on chromium win bot
Use CGI as target for POST request to prevent HTTP 405 on certain platforms.
Changed MIME type for .js to application/x-javascript in lighttpd.conf for
consistency with apache used on other platforms.
https://bugs.webkit.org/show_bug.cgi?id=45137
* http/tests/inspector/console-xhr-logging-expected.txt:
* http/tests/inspector/console-xhr-logging.html:
* http/tests/inspector/resource-har-conversion-expected.txt:
* http/tests/inspector/resource-har-conversion.html:
* http/tests/inspector/resource-parameters-expected.txt:
* http/tests/inspector/resource-parameters.html:
* http/tests/inspector/resources/post-target.cgi: Added.
* platform/chromium-win/http/tests/inspector/resource-parameters-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/win/http/tests/inspector/console-xhr-logging-expected.txt: Removed.
* platform/win/http/tests/inspector/resource-parameters-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ccebd28..8cf48ba 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-03 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ http/tests/inspector/console-xhr-logging.html and http/tests/inspector/resource-har-conversion.html are failing on chromium win bot
+ Use CGI as target for POST request to prevent HTTP 405 on certain platforms.
+ Changed MIME type for .js to application/x-javascript in lighttpd.conf for
+ consistency with apache used on other platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=45137
+
+ * http/tests/inspector/console-xhr-logging-expected.txt:
+ * http/tests/inspector/console-xhr-logging.html:
+ * http/tests/inspector/resource-har-conversion-expected.txt:
+ * http/tests/inspector/resource-har-conversion.html:
+ * http/tests/inspector/resource-parameters-expected.txt:
+ * http/tests/inspector/resource-parameters.html:
+ * http/tests/inspector/resources/post-target.cgi: Added.
+ * platform/chromium-win/http/tests/inspector/resource-parameters-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/win/http/tests/inspector/console-xhr-logging-expected.txt: Removed.
+ * platform/win/http/tests/inspector/resource-parameters-expected.txt: Removed.
+
2010-09-03 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
diff --git a/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt b/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
index 85cb331..55f50c4 100644
--- a/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
+++ b/LayoutTests/http/tests/inspector/console-xhr-logging-expected.txt
@@ -14,11 +14,11 @@ XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html
console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html".
-console-xhr-logging.html:40sending a POST request to resources/xhr-exists.html
-XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html".
+console-xhr-logging.html:40sending a POST request to resources/post-target.cgi
+XHR finished loading: "http://127.0.0.1:8000/inspector/resources/post-target.cgi".
console-xhr-logging.html:21disabled
console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html
console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
-console-xhr-logging.html:40sending a POST request to resources/xhr-exists.html
+console-xhr-logging.html:40sending a POST request to resources/post-target.cgi
diff --git a/LayoutTests/http/tests/inspector/console-xhr-logging.html b/LayoutTests/http/tests/inspector/console-xhr-logging.html
index 1c7582e..825dc05 100755
--- a/LayoutTests/http/tests/inspector/console-xhr-logging.html
+++ b/LayoutTests/http/tests/inspector/console-xhr-logging.html
@@ -31,7 +31,7 @@ function makeRequests()
// 2. Page that doesn't exist.
requestHelper("GET", "resources/xhr-does-not-exist.html");
// 3. POST to a page.
- requestHelper("POST", "resources/xhr-exists.html");
+ requestHelper("POST", "resources/post-target.cgi");
}
function requestHelper(method, url)
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
index fc8340b..2994943 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
@@ -107,7 +107,7 @@ Page reloaded.
time : <number>
request : {
method : "POST"
- url : "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html"
+ url : "http://127.0.0.1:8000/inspector/resources/post-target.cgi"
headers : <object>
headersSize : -1
bodySize : <number>
@@ -117,12 +117,12 @@ Page reloaded.
}
}
response : {
- status : 404
- statusText : "Not Found"
+ status : 200
+ statusText : "OK"
headers : <object>
content : {
size : <number>
- mimeType : "text/html"
+ mimeType : "application/xml"
}
redirectURL : ""
headersSize : -1
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion.html b/LayoutTests/http/tests/inspector/resource-har-conversion.html
index 50c6ccc..14273ad 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion.html
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion.html
@@ -27,7 +27,7 @@ var test = function()
function doXHR()
{
var xhr = new XMLHttpRequest();
- xhr.open("POST", "resources/xhr-does-not-exist.html", false);
+ xhr.open("POST", "resources/post-target.cgi", false);
xhr.setRequestHeader("Content-Type", "text/xml");
xhr.send("<xml></xml>");
}
diff --git a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
index 38c4d4f..73ab085 100644
--- a/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-parameters-expected.txt
@@ -8,7 +8,7 @@ Tests that resources panel shows form data parameters.
time : <number>
request : {
method : "POST"
- url : "http://localhost:8000/inspector/resources/resource-form-data-receiver-iframe.html?queryParam1=queryValue1&queryParam2="
+ url : "http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2="
headers : <object>
headersSize : -1
bodySize : -1
@@ -42,12 +42,12 @@ Tests that resources panel shows form data parameters.
statusText : "OK"
headers : <object>
content : {
- size : 30
- mimeType : "text/html"
+ size : 14
+ mimeType : "application/xml"
}
redirectURL : ""
headersSize : -1
- bodySize : 30
+ bodySize : 14
}
timings : {
blocked : -1
diff --git a/LayoutTests/http/tests/inspector/resource-parameters.html b/LayoutTests/http/tests/inspector/resource-parameters.html
index e87e690..31fbd88 100644
--- a/LayoutTests/http/tests/inspector/resource-parameters.html
+++ b/LayoutTests/http/tests/inspector/resource-parameters.html
@@ -41,7 +41,7 @@ function frontend_enableResourceTracking(testController)
function frontend_dumpFormData(testController)
{
- var resource = WebInspector.resourceURLMap["http://localhost:8000/inspector/resources/resource-form-data-receiver-iframe.html?queryParam1=queryValue1&queryParam2="];
+ var resource = WebInspector.resourceURLMap["http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2="];
InspectorBackend.disableResourceTracking(false);
@@ -58,7 +58,7 @@ function frontend_dumpFormData(testController)
<p>
Tests that resources panel shows form data parameters.
</p>
-<form target="target-iframe" method="POST" action="http://localhost:8000/inspector/resources/resource-form-data-receiver-iframe.html?queryParam1=queryValue1&queryParam2=">
+<form target="target-iframe" method="POST" action="http://localhost:8000/inspector/resources/post-target.cgi?queryParam1=queryValue1&queryParam2=">
<input name="formParam1" value="formValue1">
<input name="formParam2">
<input id="submit" type="submit">
diff --git a/LayoutTests/http/tests/inspector/resources/post-target.cgi b/LayoutTests/http/tests/inspector/resources/post-target.cgi
new file mode 100755
index 0000000..6b965b6
--- /dev/null
+++ b/LayoutTests/http/tests/inspector/resources/post-target.cgi
@@ -0,0 +1,4 @@
+#!/usr/bin/perl -wT
+
+print "Content-Type: application/xml\n\n";
+print "<xml>42</xml>\n";
diff --git a/LayoutTests/platform/chromium-win/http/tests/inspector/resource-parameters-expected.txt b/LayoutTests/platform/chromium-win/http/tests/inspector/resource-parameters-expected.txt
deleted file mode 100644
index 38c4d4f..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/inspector/resource-parameters-expected.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Tests that resources panel shows form data parameters.
-
-
-
-{
- pageref : "about:blank"
- startedDateTime : <string>
- time : <number>
- request : {
- method : "POST"
- url : "http://localhost:8000/inspector/resources/resource-form-data-receiver-iframe.html?queryParam1=queryValue1&queryParam2="
- headers : <object>
- headersSize : -1
- bodySize : -1
- queryString : {
- 0 : {
- name : "queryParam1"
- value : "queryValue1"
- }
- 1 : {
- name : "queryParam2"
- value : ""
- }
- }
- postData : {
- mimeType : "application/x-www-form-urlencoded"
- text : "formParam1=formValue1&formParam2="
- params : {
- 0 : {
- name : "formParam1"
- value : "formValue1"
- }
- 1 : {
- name : "formParam2"
- value : ""
- }
- }
- }
- }
- response : {
- status : 200
- statusText : "OK"
- headers : <object>
- content : {
- size : 30
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 30
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
-}
-
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index ef30c49..7a705e5 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3147,10 +3147,6 @@ BUGWK44996 WIN : inspector/report-protocol-errors.html = TEXT
// Not focusing an anchor when tab is pressed.
BUGWK45061 : fast/forms/focus2.html = FAIL
-// Failing after r66669
-BUGWK66669 WIN : http/tests/inspector/console-xhr-logging.html = TEXT
-BUGWK66669 WIN : http/tests/inspector/resource-har-conversion.html = TEXT
-
// Flaky tests
BUG54329 MAC : fast/forms/select-baseline.html = IMAGE
BUG54330 MAC : fast/forms/input-spinbutton-capturing.html = TEXT
diff --git a/LayoutTests/platform/win/http/tests/inspector/console-xhr-logging-expected.txt b/LayoutTests/platform/win/http/tests/inspector/console-xhr-logging-expected.txt
deleted file mode 100644
index c31ca71..0000000
--- a/LayoutTests/platform/win/http/tests/inspector/console-xhr-logging-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-CONSOLE MESSAGE: line 11: enabled
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-CONSOLE MESSAGE: line 21: disabled
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-CONSOLE MESSAGE: line 40: sending a %s request to %s
-Tests that XMLHttpRequest Logging works when Enabled and doesn't show logs when Disabled.
-
-console-xhr-logging.html:11enabled
-console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html
-XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html".
-console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
-resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
-XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html".
-console-xhr-logging.html:40sending a POST request to resources/xhr-exists.html
-resources/xhr-exists.htmlFailed to load resource: the server responded with a status of 405 (Method Not Allowed)
-XHR finished loading: "http://127.0.0.1:8000/inspector/resources/xhr-exists.html".
-console-xhr-logging.html:21disabled
-console-xhr-logging.html:40sending a GET request to resources/xhr-exists.html
-console-xhr-logging.html:40sending a GET request to resources/xhr-does-not-exist.html
-resources/xhr-does-not-exist.htmlFailed to load resource: the server responded with a status of 404 (Not Found)
-console-xhr-logging.html:40sending a POST request to resources/xhr-exists.html
-resources/xhr-exists.htmlFailed to load resource: the server responded with a status of 405 (Method Not Allowed)
-
diff --git a/LayoutTests/platform/win/http/tests/inspector/resource-parameters-expected.txt b/LayoutTests/platform/win/http/tests/inspector/resource-parameters-expected.txt
deleted file mode 100644
index 5e8f120..0000000
--- a/LayoutTests/platform/win/http/tests/inspector/resource-parameters-expected.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Tests that resources panel shows form data parameters.
-
-
-
-{
- pageref : "about:blank"
- startedDateTime : <string>
- time : <number>
- request : {
- method : "POST"
- url : "http://localhost:8000/inspector/resources/resource-form-data-receiver-iframe.html?queryParam1=queryValue1&queryParam2="
- headers : <object>
- headersSize : -1
- bodySize : -1
- queryString : {
- 0 : {
- name : "queryParam1"
- value : "queryValue1"
- }
- 1 : {
- name : "queryParam2"
- value : ""
- }
- }
- postData : {
- mimeType : "application/x-www-form-urlencoded"
- text : "formParam1=formValue1&formParam2="
- params : {
- 0 : {
- name : "formParam1"
- value : "formValue1"
- }
- 1 : {
- name : "formParam2"
- value : ""
- }
- }
- }
- }
- response : {
- status : 405
- statusText : "Method Not Allowed"
- headers : <object>
- content : {
- size : 345
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 345
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
-}
-
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ed20c3c..1f2ef3e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-03 Andrey Kosyakov <caseq at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ http/tests/inspector/console-xhr-logging.html and http/tests/inspector/resource-har-conversion.html are failing on chromium win bot
+ Changed MIME type for .js to application/x-javascript for consistency with apache used on other platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=45137
+
+ * Scripts/webkitpy/layout_tests/port/lighttpd.conf:
+
2010-09-03 Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/lighttpd.conf b/WebKitTools/Scripts/webkitpy/layout_tests/port/lighttpd.conf
index 2e9c82e..26ca22f 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/lighttpd.conf
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/lighttpd.conf
@@ -22,7 +22,7 @@ mimetype.assign = (
".htm" => "text/html",
".xhtml" => "application/xhtml+xml",
".xhtmlmp" => "application/vnd.wap.xhtml+xml",
- ".js" => "text/javascript",
+ ".js" => "application/x-javascript",
".log" => "text/plain",
".conf" => "text/plain",
".text" => "text/plain",
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list