[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:56:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d589e3b889d5601a40544be5ef3259deabbf0279
Author: caseq at chromium.org <caseq at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 2 16:30:09 2010 +0000
2010-09-02 Andrey Kosyakov <caseq at chromium.org>
Unreviewed test fix.
Add size & bodySize to list of non-deterministic fields for HAR tests, as those tend to vary by platform
in error responses.
Remove platform-specific expectations that were previously added because of this.
* http/tests/inspector/resource-har-conversion-expected.txt:
* http/tests/inspector/resource-har-conversion.html:
* http/tests/inspector/resource-test2.js:
* platform/chromium-win/inspector/resource-har-conversion-expected.txt: Removed.
* platform/win/http/tests/inspector/resource-har-conversion-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6b386ab..cab15c3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-02 Andrey Kosyakov <caseq at chromium.org>
+
+ Unreviewed test fix.
+ Add size & bodySize to list of non-deterministic fields for HAR tests, as those tend to vary by platform
+ in error responses.
+ Remove platform-specific expectations that were previously added because of this.
+
+ * http/tests/inspector/resource-har-conversion-expected.txt:
+ * http/tests/inspector/resource-har-conversion.html:
+ * http/tests/inspector/resource-test2.js:
+ * platform/chromium-win/inspector/resource-har-conversion-expected.txt: Removed.
+ * platform/win/http/tests/inspector/resource-har-conversion-expected.txt: Removed.
+
2010-09-02 Nate Chapin <japhet at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
index eaad6e6..fc8340b 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion-expected.txt
@@ -11,19 +11,19 @@ Page reloaded.
url : "http://127.0.0.1:8000/inspector/inspector-test2.js"
headers : <object>
headersSize : -1
- bodySize : -1
+ bodySize : <number>
}
response : {
status : 304
statusText : "Not Modified"
headers : <object>
content : {
- size : 0
+ size : <number>
mimeType : "application/x-javascript"
}
redirectURL : ""
headersSize : -1
- bodySize : 0
+ bodySize : <number>
}
timings : {
blocked : -1
@@ -44,19 +44,19 @@ Page reloaded.
url : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
headers : <object>
headersSize : -1
- bodySize : -1
+ bodySize : <number>
}
response : {
status : 200
statusText : "OK"
headers : <object>
content : {
- size : 1137
+ size : <number>
mimeType : "text/html"
}
redirectURL : ""
headersSize : -1
- bodySize : 1137
+ bodySize : <number>
}
timings : {
blocked : -1
@@ -77,19 +77,19 @@ Page reloaded.
url : "http://127.0.0.1:8000/inspector/resource-test2.js"
headers : <object>
headersSize : -1
- bodySize : -1
+ bodySize : <number>
}
response : {
status : 304
statusText : "Not Modified"
headers : <object>
content : {
- size : 0
+ size : <number>
mimeType : "application/x-javascript"
}
redirectURL : ""
headersSize : -1
- bodySize : 0
+ bodySize : <number>
}
timings : {
blocked : -1
@@ -110,7 +110,7 @@ Page reloaded.
url : "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html"
headers : <object>
headersSize : -1
- bodySize : -1
+ bodySize : <number>
postData : {
mimeType : "text/xml"
text : "<xml></xml>"
@@ -121,12 +121,12 @@ Page reloaded.
statusText : "Not Found"
headers : <object>
content : {
- size : 355
+ size : <number>
mimeType : "text/html"
}
redirectURL : ""
headersSize : -1
- bodySize : 355
+ bodySize : <number>
}
timings : {
blocked : -1
diff --git a/LayoutTests/http/tests/inspector/resource-har-conversion.html b/LayoutTests/http/tests/inspector/resource-har-conversion.html
index 09c802a..50c6ccc 100644
--- a/LayoutTests/http/tests/inspector/resource-har-conversion.html
+++ b/LayoutTests/http/tests/inspector/resource-har-conversion.html
@@ -15,7 +15,7 @@ var test = function()
InspectorTest.enableResourceTracking(function() {
InjectedScriptAccess.getDefault().evaluate("doXHR()", "console", function() {
var resources = Object.keys(WebInspector.resources).map(getHAR).sort(InspectorTest.resourceURLComparer);
- InspectorTest.addObject(resources, InspectorTest.HARNondeterministicProperties);
+ InspectorTest.addObject(resources, InspectorTest.HARNondeterministicPropertiesWithSize);
InspectorTest.disableResourceTracking();
InspectorTest.completeTest();
});
diff --git a/LayoutTests/http/tests/inspector/resource-test2.js b/LayoutTests/http/tests/inspector/resource-test2.js
index 44726c5..fd878a3 100755
--- a/LayoutTests/http/tests/inspector/resource-test2.js
+++ b/LayoutTests/http/tests/inspector/resource-test2.js
@@ -8,6 +8,12 @@ InspectorTest.HARNondeterministicProperties = {
headers: 1,
};
+// addObject checks own properties only, so make a deep copy rather than use prototype.
+
+InspectorTest.HARNondeterministicPropertiesWithSize = JSON.parse(JSON.stringify(InspectorTest.HARNondeterministicProperties));
+InspectorTest.HARNondeterministicPropertiesWithSize.size = 1;
+InspectorTest.HARNondeterministicPropertiesWithSize.bodySize = 1;
+
InspectorTest.resourceURLComparer = function(r1, r2)
{
return r1.request.url.localeCompare(r2.request.url);
diff --git a/LayoutTests/platform/chromium-win/inspector/resource-har-conversion-expected.txt b/LayoutTests/platform/chromium-win/inspector/resource-har-conversion-expected.txt
deleted file mode 100755
index 98d01de..0000000
--- a/LayoutTests/platform/chromium-win/inspector/resource-har-conversion-expected.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-Tests conversion of Inspector's resource representation into HAR format.
-
-Page reloaded.
-{
- 0 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/inspector-test2.js"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 304
- statusText : "Not Modified"
- headers : <object>
- content : {
- size : 0
- mimeType : "application/x-javascript"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 0
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 1 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 200
- statusText : "OK"
- headers : <object>
- content : {
- size : 1137
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 1137
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 2 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/resource-test2.js"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 304
- statusText : "Not Modified"
- headers : <object>
- content : {
- size : 0
- mimeType : "application/x-javascript"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 0
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 3 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "POST"
- url : "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html"
- headers : <object>
- headersSize : -1
- bodySize : -1
- postData : {
- mimeType : "text/xml"
- text : "<xml></xml>"
- }
- }
- response : {
- status : 404
- statusText : "Not Found"
- headers : <object>
- content : {
- size : 305
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 305
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
-}
-
diff --git a/LayoutTests/platform/win/http/tests/inspector/resource-har-conversion-expected.txt b/LayoutTests/platform/win/http/tests/inspector/resource-har-conversion-expected.txt
deleted file mode 100755
index 98d01de..0000000
--- a/LayoutTests/platform/win/http/tests/inspector/resource-har-conversion-expected.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-Tests conversion of Inspector's resource representation into HAR format.
-
-Page reloaded.
-{
- 0 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/inspector-test2.js"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 304
- statusText : "Not Modified"
- headers : <object>
- content : {
- size : 0
- mimeType : "application/x-javascript"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 0
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 1 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 200
- statusText : "OK"
- headers : <object>
- content : {
- size : 1137
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 1137
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 2 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "GET"
- url : "http://127.0.0.1:8000/inspector/resource-test2.js"
- headers : <object>
- headersSize : -1
- bodySize : -1
- }
- response : {
- status : 304
- statusText : "Not Modified"
- headers : <object>
- content : {
- size : 0
- mimeType : "application/x-javascript"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 0
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
- 3 : {
- pageref : "http://127.0.0.1:8000/inspector/resource-har-conversion.html"
- startedDateTime : <object>
- time : <number>
- request : {
- method : "POST"
- url : "http://127.0.0.1:8000/inspector/resources/xhr-does-not-exist.html"
- headers : <object>
- headersSize : -1
- bodySize : -1
- postData : {
- mimeType : "text/xml"
- text : "<xml></xml>"
- }
- }
- response : {
- status : 404
- statusText : "Not Found"
- headers : <object>
- content : {
- size : 305
- mimeType : "text/html"
- }
- redirectURL : ""
- headersSize : -1
- bodySize : 305
- }
- timings : {
- blocked : -1
- dns : -1
- connect : -1
- send : -1
- wait : <number>
- receive : <number>
- ssl : -1
- }
- }
-}
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list