Skip to content

GitLab

T
tangled
Commit c797a4c5 authored by Kunihiko Sakamoto's avatar Kunihiko Sakamoto Committed by Commit Bot
Browse files
Options

Replace "htxg" in layout tests with "sxg" 

This completes the htxg -> sxg renaming.

Bug: 856530
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Idf5243b0ff08acc761313299415bcb7fa32b333d
Reviewed-on: https://chromium-review.googlesource.com/1132835Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574101}
parent 07d2a0be
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 90 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-gen-property-trees
View file @ c797a4c5
......@@ -86,8 +86,8 @@ Bug(none) virtual/feature-policy-vibrate/ [ Skip ]
Bug(none) virtual/gpu-rasterization/ [ Skip ]
Bug(none) virtual/gpu/ [ Skip ]
Bug(none) virtual/high-contrast-mode/ [ Skip ]
Bug(none) virtual/htxg-with-network-service/ [ Skip ]
Bug(none) virtual/htxg/ [ Skip ]
Bug(none) virtual/sxg-with-network-service/ [ Skip ]
Bug(none) virtual/sxg/ [ Skip ]
Bug(none) virtual/import-meta-url/ [ Skip ]
Bug(none) virtual/layout_ng/ [ Skip ]
Bug(none) virtual/layout_ng_experimental/ [ Skip ]
......
third_party/WebKit/LayoutTests/TestExpectations
View file @ c797a4c5
......@@ -4307,16 +4307,16 @@ crbug.com/818154 [ Linux Debug ] virtual/gpu-rasterization/images/gif-loop-count
crbug.com/818650 [ Linux ] fast/speech/scripted/speechrecognition-restart-onend.html [ Crash Pass ]
# These tests will pass once the --enable-features=SignedHTTPExchange flag is enabled by default.
crbug.com/803774 http/tests/devtools/htxg/ [ Skip ]
crbug.com/803774 http/tests/loading/htxg/ [ Skip ]
crbug.com/803774 http/tests/devtools/sxg/ [ Skip ]
crbug.com/803774 http/tests/loading/sxg/ [ Skip ]
# Signed Exchange is temporarily disabled when Network Service is enabled.
crbug.com/849935 virtual/htxg-with-network-service/ [ Skip ]
crbug.com/849935 virtual/htxg-origin-trial-with-network-service/ [ Skip ]
crbug.com/849935 virtual/sxg-with-network-service/ [ Skip ]
crbug.com/849935 virtual/sxg-origin-trial-with-network-service/ [ Skip ]
# Prefetching Signed Exchange DevTools tests are flaky.
crbug.com/851363 virtual/htxg/http/tests/devtools/htxg/htxg-prefetch-expired.js [ Pass Failure ]
crbug.com/851363 virtual/htxg/http/tests/devtools/htxg/htxg-prefetch.js [ Pass Failure ]
crbug.com/851363 virtual/sxg/http/tests/devtools/sxg/sxg-prefetch-expired.js [ Pass Failure ]
crbug.com/851363 virtual/sxg/http/tests/devtools/sxg/sxg-prefetch.js [ Pass Failure ]
# Sheriff 2018-03-22
crbug.com/824775 [ Win Mac ] media/controls/video-controls-with-cast-rendering.html [ Pass Failure ]
......
third_party/WebKit/LayoutTests/VirtualTestSuites
View file @ c797a4c5
......@@ -581,33 +581,33 @@
"args": ["--sampling-heap-profiler"]
},
{
"prefix": "htxg",
"base": "http/tests/loading/htxg",
"prefix": "sxg",
"base": "http/tests/loading/sxg",
"args": ["--enable-features=SignedHTTPExchange"]
},
{
"prefix": "htxg",
"base": "http/tests/devtools/htxg",
"prefix": "sxg",
"base": "http/tests/devtools/sxg",
"args": ["--enable-features=SignedHTTPExchange"]
},
{
"prefix": "htxg-with-network-service",
"base": "http/tests/loading/htxg",
"prefix": "sxg-with-network-service",
"base": "http/tests/loading/sxg",
"args": ["--enable-features=SignedHTTPExchange,NetworkService"]
},
{
"prefix": "htxg-with-network-service",
"base": "http/tests/devtools/htxg",
"prefix": "sxg-with-network-service",
"base": "http/tests/devtools/sxg",
"args": ["--enable-features=SignedHTTPExchange,NetworkService"]
},
{
"prefix": "htxg-origin-trial",
"base": "http/tests/loading/htxg",
"prefix": "sxg-origin-trial",
"base": "http/tests/loading/sxg",
"args": ["--enable-features=SignedHTTPExchangeOriginTrial"]
},
{
"prefix": "htxg-origin-trial-with-network-service",
"base": "http/tests/loading/htxg",
"prefix": "sxg-origin-trial-with-network-service",
"base": "http/tests/loading/sxg",
"args": ["--enable-features=SignedHTTPExchangeOriginTrial,NetworkService"]
},
{
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-cert-not-found-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-cert-not-found-expected.txt
View file @ c797a4c5
......@@ -2,16 +2,16 @@ Tests the signed exchange information are available when the certificate file is
inspected-page.html:1 Invalid reponse code: 404
inspected-page.html:1 Failed to fetch the certificate.
* http://127.0.0.1:8000/loading/htxg/resources/htxg-cert-not-found.sxg
* http://127.0.0.1:8000/loading/sxg/resources/sxg-cert-not-found.sxg
failed: true
statusCode: 200
resourceType: document
SignedExchangeInfo
Request URL: https://127.0.0.1:8443/not_found_cert.html
Certificate URL: https://127.0.0.1:8443/loading/htxg/resources/not_found_cert.pem.cbor
Certificate URL: https://127.0.0.1:8443/loading/sxg/resources/not_found_cert.pem.cbor
Error: {"message":"Invalid reponse code: 404"}
Error: {"message":"Failed to fetch the certificate.","signatureIndex":0,"errorField":"signatureCertUrl"}
* https://127.0.0.1:8443/loading/htxg/resources/not_found_cert.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/not_found_cert.pem.cbor
failed: false
statusCode: 404
resourceType: other
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-cert-not-found.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-cert-not-found.js
View file @ c797a4c5
......@@ -6,13 +6,13 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC".
await TestRunner.evaluateInPageAsync(
'setSignedExchangeVerificationTime(new Date("Apr 1 2018 00:01 UTC"))');
BrowserSDK.networkLog.reset();
await TestRunner.addIframe('/loading/htxg/resources/htxg-cert-not-found.sxg');
await TestRunner.addIframe('/loading/sxg/resources/sxg-cert-not-found.sxg');
ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
TestRunner.completeTest();
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-disable-cache-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-disable-cache-expected.txt
View file @ c797a4c5
The 'disable cache' flag must affect on the certificate fetch request.
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
cached: false
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
cached: false
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
cached: false
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
cached: false
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-disable-cache.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-disable-cache.js
View file @ c797a4c5
......@@ -5,14 +5,14 @@
TestRunner.addResult('The \'disable cache\' flag must affect on the certificate fetch request.\n');
const outerUrl =
'https://127.0.0.1:8443/loading/htxg/resources/htxg-location.sxg';
'https://127.0.0.1:8443/loading/sxg/resources/sxg-location.sxg';
const certUrl =
'https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor';
'https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor';
const innerUrl = 'https://127.0.0.1:8443/test.html';
await TestRunner.loadModule('network_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC".
await TestRunner.evaluateInPageAsync(
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-navigation-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-navigation-expected.txt
View file @ c797a4c5
Tests the signed exchange information are available when the navigation succeeded.
* http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg
* http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg
failed: false
statusCode: 200
resourceType: signed-exchange
SignedExchangeInfo
Request URL: https://127.0.0.1:8443/test.html
Certificate URL: https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
Certificate URL: https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
Certificate Subject: 127.0.0.1
Certificate Issuer: web-platform-tests
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
failed: false
statusCode: 200
resourceType: other
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-navigation-expired-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-navigation-expired-expected.txt
View file @ c797a4c5
......@@ -2,16 +2,16 @@ Tests the signed exchange information are available when the navigation failed.
inspected-page.html:1 Invalid timestamp. creation_time: 1522540800, expires_time: 1523145600, verification_time: 1523318460
inspected-page.html:1 Failed to verify the signed exchange header.
* http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg
* http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg
failed: true
statusCode: 200
resourceType: document
SignedExchangeInfo
Request URL: https://127.0.0.1:8443/test.html
Certificate URL: https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
Certificate URL: https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
Error: {"message":"Invalid timestamp. creation_time: 1522540800, expires_time: 1523145600, verification_time: 1523318460"}
Error: {"message":"Failed to verify the signed exchange header.","signatureIndex":0,"errorField":"signatureTimestamps"}
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
failed: false
statusCode: 200
resourceType: other
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-navigation-expired.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-navigation-expired.js
View file @ c797a4c5
......@@ -6,13 +6,13 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC". So in Apr 10, the page load should fail.
await TestRunner.evaluateInPageAsync(
'setSignedExchangeVerificationTime(new Date("Apr 10 2018 00:01 UTC"))');
BrowserSDK.networkLog.reset();
await TestRunner.addIframe('/loading/htxg/resources/htxg-location.sxg');
await TestRunner.addIframe('/loading/sxg/resources/sxg-location.sxg');
ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
TestRunner.completeTest();
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-navigation.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-navigation.js
View file @ c797a4c5
......@@ -6,13 +6,13 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC".
await TestRunner.evaluateInPageAsync(
'setSignedExchangeVerificationTime(new Date("Apr 1 2018 00:01 UTC"))');
BrowserSDK.networkLog.reset();
await TestRunner.addIframe('/loading/htxg/resources/htxg-location.sxg');
await TestRunner.addIframe('/loading/sxg/resources/sxg-location.sxg');
ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
TestRunner.completeTest();
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-prefetch-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-prefetch-expected.txt
View file @ c797a4c5
Tests the signed exchange information are available when the prefetch succeeded.
* http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg
* http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg
failed: false
statusCode: 200
resourceType: signed-exchange
SignedExchangeInfo
Request URL: https://127.0.0.1:8443/test.html
Certificate URL: https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
Certificate URL: https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
Certificate Subject: 127.0.0.1
Certificate Issuer: web-platform-tests
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
failed: false
statusCode: 200
resourceType: other
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-prefetch-expired-expected.txt → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-prefetch-expired-expected.txt
View file @ c797a4c5
Tests the signed exchange information are available when the prefetch failed.
* http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg
* http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg
failed: true
statusCode: 200
resourceType: other
SignedExchangeInfo
Request URL: https://127.0.0.1:8443/test.html
Certificate URL: https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
Certificate URL: https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
Error: {"message":"Invalid timestamp. creation_time: 1522540800, expires_time: 1523145600, verification_time: 1523318460"}
Error: {"message":"Failed to verify the signed exchange header.","signatureIndex":0,"errorField":"signatureTimestamps"}
* https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor
* https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor
failed: false
statusCode: 200
resourceType: other
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-prefetch-expired.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-prefetch-expired.js
View file @ c797a4c5
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC". So in Apr 10, the prefetch should fail.
await TestRunner.evaluateInPageAsync(
......@@ -17,7 +17,7 @@
TestRunner.addSniffer(SDK.NetworkDispatcher.prototype, 'loadingFailed', loadingFailed, true);
function loadingFailed(requestId, time, localizedDescription, canceled) {
var request = BrowserSDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
if (/htxg-location\.sxg/.exec(request.url()))
if (/sxg-location\.sxg/.exec(request.url()))
resolve();
}
});
......@@ -26,7 +26,7 @@
(function () {
const link = document.createElement('link');
link.rel = 'prefetch';
link.href = '/loading/htxg/resources/htxg-location.sxg';
link.href = '/loading/sxg/resources/sxg-location.sxg';
document.body.appendChild(link);
})()
`);
......
third_party/WebKit/LayoutTests/http/tests/devtools/htxg/htxg-prefetch.js → third_party/WebKit/LayoutTests/http/tests/devtools/sxg/sxg-prefetch.js
View file @ c797a4c5
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
await TestRunner.addScriptTag('/loading/htxg/resources/htxg-util.js');
await TestRunner.addScriptTag('/loading/sxg/resources/sxg-util.js');
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC".
await TestRunner.evaluateInPageAsync(
......@@ -26,7 +26,7 @@
(function () {
const link = document.createElement('link');
link.rel = 'prefetch';
link.href = '/loading/htxg/resources/htxg-location.sxg';
link.href = '/loading/sxg/resources/sxg-location.sxg';
document.body.appendChild(link);
})()
`);
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/resources/README.md → third_party/WebKit/LayoutTests/http/tests/loading/sxg/resources/README.md
View file @ c797a4c5
The certificate message files (\*.msg) and the signed exchange files
(\*.htxg) in this directory are generated using the following commands.
(\*.sxg) in this directory are generated using the following commands.
gen-certurl and gen-signedexchange are available in [webpackage repository][1].
Revision cf19833 is used to generate these files.
......@@ -39,28 +39,28 @@ gen-certurl \
gen-signedexchange \
-uri https://127.0.0.1:8443/test.html \
-status 200 \
-content htxg-location.html \
-content sxg-location.html \
-certificate ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.pem \
-certUrl https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor \
-validityUrl https://127.0.0.1:8443/loading/htxg/resources/resource.validity.msg \
-certUrl https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor \
-validityUrl https://127.0.0.1:8443/loading/sxg/resources/resource.validity.msg \
-privateKey ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.key \
-date 2018-04-01T00:00:00Z \
-expire 168h \
-o htxg-location.sxg \
-o sxg-location.sxg \
-miRecordSize 100
# Generate the signed exchange file which certificate file is not available.
gen-signedexchange \
-uri https://127.0.0.1:8443/not_found_cert.html \
-status 200 \
-content htxg-location.html \
-content sxg-location.html \
-certificate ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.pem \
-certUrl https://127.0.0.1:8443/loading/htxg/resources/not_found_cert.pem.cbor \
-validityUrl https://127.0.0.1:8443/loading/htxg/resources/not_found_cert.validity.msg \
-certUrl https://127.0.0.1:8443/loading/sxg/resources/not_found_cert.pem.cbor \
-validityUrl https://127.0.0.1:8443/loading/sxg/resources/not_found_cert.validity.msg \
-privateKey ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.key \
-date 2018-04-01T00:00:00Z \
-expire 168h \
-o htxg-cert-not-found.sxg \
-o sxg-cert-not-found.sxg \
-miRecordSize 100
# Generate the signed exchange file which validity URL is different origin from
......@@ -68,13 +68,13 @@ gen-signedexchange \
gen-signedexchange \
-uri https://127.0.0.1:8443/test.html \
-status 200 \
-content htxg-location.html \
-content sxg-location.html \
-certificate ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.pem \
-certUrl https://127.0.0.1:8443/loading/htxg/resources/127.0.0.1.sxg.pem.cbor \
-validityUrl https://www2.127.0.0.1/loading/htxg/resources/resource.validity.msg \
-certUrl https://127.0.0.1:8443/loading/sxg/resources/127.0.0.1.sxg.pem.cbor \
-validityUrl https://www2.127.0.0.1/loading/sxg/resources/resource.validity.msg \
-privateKey ../../../../../../../blink/tools/blinkpy/third_party/wpt/certs/127.0.0.1.sxg.key \
-date 2018-04-01T00:00:00Z \
-expire 168h \
-o htxg-invalid-validity-url.sxg \
-o sxg-invalid-validity-url.sxg \
-miRecordSize 100
```
third_party/WebKit/LayoutTests/http/tests/loading/htxg/resources/htxg-location-origin-trial.php → third_party/WebKit/LayoutTests/http/tests/loading/sxg/resources/sxg-location-origin-trial.php
View file @ c797a4c5
......@@ -3,7 +3,7 @@ header('HTTP/1.0 200 OK');
// generate_token.py http://127.0.0.1:8000 SignedHTTPExchange --expire-timestamp=2000000000
header("Origin-Trial: AgeFm+W/+DvAEn/vDjtqgd5PQX73YxKJLGBwLp14SiMjKFNTEUK2Bx5R3gH23JOfP+IL2EGNj+x9uhzh2krVRgsAAABaeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiU2lnbmVkSFRUUEV4Y2hhbmdlIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9");
header("Content-Type: application/signed-exchange;v=b1");
$name = 'htxg-location.sxg';
$name = 'sxg-location.sxg';
$fp = fopen($name, 'rb');
header("Content-Length: " . filesize($name));
fpassthru($fp);
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-double-prefetch.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-double-prefetch.html
View file @ c797a4c5
......@@ -2,7 +2,7 @@
<title>Prefetching double SignedHTTPExchange files must not crash</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
function addPrefetch(url) {
......@@ -15,19 +15,19 @@ promise_test(async (t) => {
// The timestamp of the test SXG file is "Apr 1 2018 00:00 UTC" and valid
// until "Apr 8 2018 00:00 UTC".
await setSignedExchangeVerificationTime(new Date("Apr 1 2018 00:01 UTC"));
const htxg1_url =
'http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg?1';
const htxg2_url =
'http://127.0.0.1:8000/loading/htxg/resources/htxg-location.sxg?2';
addPrefetch(htxg1_url);
addPrefetch(htxg2_url);
const sxg1_url =
'http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg?1';
const sxg2_url =
'http://127.0.0.1:8000/loading/sxg/resources/sxg-location.sxg?2';
addPrefetch(sxg1_url);
addPrefetch(sxg2_url);
await new Promise(resolve => {
setInterval(() => {
const entries = performance.getEntriesByType("resource");
let hit_count = 0;
for (let i = 0; i < entries.length; ++i) {
const entry = entries[i];
if (entry.name == htxg1_url || entry.name == htxg2_url) {
if (entry.name == sxg1_url || entry.name == sxg2_url) {
if (++hit_count == 2)
resolve();
}
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-expired.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-expired.html
View file @ c797a4c5
......@@ -2,7 +2,7 @@
<title>Loading expired SignedHTTPExchange must fail</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
promise_test(async (t) => {
......@@ -17,7 +17,7 @@ promise_test(async (t) => {
t.step_timeout(() => resolve(), 1000);
const frame =
await withIframe('resources/htxg-location.sxg', 'htxg_iframe');
await withIframe('resources/sxg-location.sxg', 'sxg_iframe');
const channel = new MessageChannel();
channel.port1.onmessage = () => {
reject('Page load should fail');
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-invalid-validity-url.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-invalid-validity-url.html
View file @ c797a4c5
......@@ -3,7 +3,7 @@
request URL must fail</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
promise_test(async (t) => {
......@@ -16,8 +16,8 @@ promise_test(async (t) => {
await new Promise(async (resolve, reject) => {
// We can't catch the network error on iframe. So we use the timer.
t.step_timeout(() => resolve(), 1000);
const url = 'resources/htxg-invalid-validity-url.sxg';
const frame = await withIframe(url, 'htxg_iframe');
const url = 'resources/sxg-invalid-validity-url.sxg';
const frame = await withIframe(url, 'sxg_iframe');
const channel = new MessageChannel();
channel.port1.onmessage = () => {
reject('Page load should fail');
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-location-origin-trial.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-location-origin-trial.html
View file @ c797a4c5
......@@ -2,7 +2,7 @@
<title>Location of SignedHTTPExchange with Origin-Trial header</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
promise_test(async (t) => {
......@@ -17,8 +17,8 @@ promise_test(async (t) => {
t.step_timeout(() => reject('timeout'), 1000);
const frame =
await withIframe('resources/htxg-location-origin-trial.php',
'htxg_iframe');
await withIframe('resources/sxg-location-origin-trial.php',
'sxg_iframe');
const channel = new MessageChannel();
channel.port1.onmessage = resolve;
frame.contentWindow.postMessage(
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-location.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-location.html
View file @ c797a4c5
......@@ -2,7 +2,7 @@
<title>Location of SignedHTTPExchange</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
promise_test(async (t) => {
......@@ -17,7 +17,7 @@ promise_test(async (t) => {
t.step_timeout(() => reject('timeout'), 1000);
const frame =
await withIframe('resources/htxg-location.sxg', 'htxg_iframe');
await withIframe('resources/sxg-location.sxg', 'sxg_iframe');
const channel = new MessageChannel();
channel.port1.onmessage = resolve;
frame.contentWindow.postMessage(
......
third_party/WebKit/LayoutTests/http/tests/loading/htxg/htxg-non-secure-origin.html → third_party/WebKit/LayoutTests/http/tests/loading/sxg/sxg-non-secure-origin.html
View file @ c797a4c5
......@@ -2,7 +2,7 @@
<title>Loading SignedHTTPExchange from non secure origin must fail</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="./resources/htxg-util.js"></script>
<script src="./resources/sxg-util.js"></script>
<body>
<script>
promise_test(async (t) => {
......@@ -16,8 +16,8 @@ promise_test(async (t) => {
// We can't catch the network error on iframe. So we use the timer.
t.step_timeout(() => resolve(), 1000);
const url =
'http://example.test:8080/loading/htxg/resources/htxg-location.htxg';
const frame = await withIframe(url, 'htxg_iframe');
'http://example.test:8080/loading/sxg/resources/sxg-location.sxg';
const frame = await withIframe(url, 'sxg_iframe');
const channel = new MessageChannel();
channel.port1.onmessage = () => {
reject('Page load should fail');
......
third_party/WebKit/LayoutTests/virtual/htxg-origin-trial-with-network-service/http/tests/loading/htxg/htxg-location-expected.txt → third_party/WebKit/LayoutTests/virtual/sxg-origin-trial-with-network-service/http/tests/loading/sxg/sxg-location-expected.txt
View file @ c797a4c5
......@@ -4,9 +4,9 @@ main frame - didReceiveTitle: Location of SignedHTTPExchange
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
frame "htxg_iframe" - didReceiveTitle:
frame "htxg_iframe" - didStartProvisionalLoadForFrame
frame "htxg_iframe" - didFailProvisionalLoadWithError
frame "sxg_iframe" - didReceiveTitle:
frame "sxg_iframe" - didStartProvisionalLoadForFrame
frame "sxg_iframe" - didFailProvisionalLoadWithError
This is a testharness.js-based test.
FAIL Location of SignedHTTPExchange promise_test: Unhandled rejection with value: "timeout"
Harness: the test ran to completion.
......
third_party/WebKit/LayoutTests/virtual/htxg-origin-trial/http/tests/loading/htxg/htxg-location-expected.txt → third_party/WebKit/LayoutTests/virtual/sxg-origin-trial/http/tests/loading/sxg/sxg-location-expected.txt
View file @ c797a4c5
......@@ -4,9 +4,9 @@ main frame - didReceiveTitle: Location of SignedHTTPExchange
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
frame "htxg_iframe" - didReceiveTitle:
frame "htxg_iframe" - didStartProvisionalLoadForFrame
frame "htxg_iframe" - didFailProvisionalLoadWithError
frame "sxg_iframe" - didReceiveTitle:
frame "sxg_iframe" - didStartProvisionalLoadForFrame
frame "sxg_iframe" - didFailProvisionalLoadWithError
This is a testharness.js-based test.
FAIL Location of SignedHTTPExchange promise_test: Unhandled rejection with value: "timeout"
Harness: the test ran to completion.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment