Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt (232412 => 232413)
--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt 2018-06-01 20:24:36 UTC (rev 232412)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt 2018-06-01 20:41:04 UTC (rev 232413)
@@ -540,6 +540,10 @@
"value": "http-only"
},
{
+ "name": "same-site-strict",
+ "value": "same-site-strict"
+ },
+ {
"name": "simple",
"value": "simple"
},
@@ -546,10 +550,6 @@
{
"name": "with-expiration",
"value": "with-expiration"
- },
- {
- "name": "same-site-strict",
- "value": "same-site-strict"
}
],
"headers": "<filtered>",
@@ -607,6 +607,14 @@
"value": "http-only"
},
{
+ "name": "same-site-implicit-strict",
+ "value": "same-site-implicit-strict"
+ },
+ {
+ "name": "same-site-strict",
+ "value": "same-site-strict"
+ },
+ {
"name": "simple",
"value": "simple"
},
@@ -613,14 +621,6 @@
{
"name": "with-expiration",
"value": "with-expiration"
- },
- {
- "name": "same-site-implicit-strict",
- "value": "same-site-implicit-strict"
- },
- {
- "name": "same-site-strict",
- "value": "same-site-strict"
}
],
"headers": "<filtered>",
@@ -678,14 +678,6 @@
"value": "http-only"
},
{
- "name": "simple",
- "value": "simple"
- },
- {
- "name": "with-expiration",
- "value": "with-expiration"
- },
- {
"name": "same-site-implicit-strict",
"value": "same-site-implicit-strict"
},
@@ -696,6 +688,14 @@
{
"name": "same-site-strict-because-invalid-SameSite-value",
"value": "same-site-strict-because-invalid-SameSite-value"
+ },
+ {
+ "name": "simple",
+ "value": "simple"
+ },
+ {
+ "name": "with-expiration",
+ "value": "with-expiration"
}
],
"headers": "<filtered>",
Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page.html (232412 => 232413)
--- trunk/LayoutTests/http/tests/inspector/network/har/har-page.html 2018-06-01 20:24:36 UTC (rev 232412)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page.html 2018-06-01 20:41:04 UTC (rev 232413)
@@ -50,9 +50,12 @@
return "<filtered>";
}
- // Sort cookies by name to make cookie order deterministic between test runs.
- if (key === "cookies")
- value.sort((a, b) => { return a.name - b.name; });
+ // Sort cookies by name to make cookie order deterministic between test runs. We assume
+ // that cookies have names that consist of only ASCII characters.
+ if (key === "cookies") {
+ value.sort((a, b) => { return a.name === b.name ? 0 : (a.name < b.name ? -1 : 1); });
+ return value;
+ }
// Since cache may or may not be used, timing data may be variable.
// NOTE: SSL should always be -1 for this test case.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (232412 => 232413)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2018-06-01 20:24:36 UTC (rev 232412)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2018-06-01 20:41:04 UTC (rev 232413)
@@ -3407,8 +3407,6 @@
webkit.org/b/186100 css3/color-filters/color-filter-opacity.html [ ImageOnlyFailure ]
webkit.org/b/186100 fast/hidpi/filters-turbulence.html [ ImageOnlyFailure ]
-webkit.org/b/186137 http/tests/inspector/network/har/har-page.html [ Failure ]
-
webkit.org/b/186138 imported/mozilla/css-transitions/test_event-dispatch.html [ Failure ]
webkit.org/b/186139 imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property.html [ Failure ]