Update service worker resource timing test to use {{hosts[alt]}} (#16571)
hosts[alt] works in more configurations than domains[www1].
See https://github.com/web-platform-tests/wpt/issues/15692 for background information
diff --git a/service-workers/service-worker/resource-timing.https.html b/service-workers/service-worker/resource-timing.sub.https.html
similarity index 96%
rename from service-workers/service-worker/resource-timing.https.html
rename to service-workers/service-worker/resource-timing.sub.https.html
index 7fc3fcd..f0502ca 100644
--- a/service-workers/service-worker/resource-timing.https.html
+++ b/service-workers/service-worker/resource-timing.sub.https.html
@@ -1,15 +1,14 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
<script src="resources/test-helpers.sub.js"></script>
<script>
function resourceUrl(path) {
- return get_host_info()['HTTPS_ORIGIN'] + base_path() + path;
+ return "https://{{host}}:{{ports[https][0]}}" + base_path() + path;
}
function crossOriginUrl(path) {
- return get_host_info()['HTTPS_REMOTE_ORIGIN'] + base_path() + path;
+ return "https://{{hosts[alt][]}}:{{ports[https][0]}}" + base_path() + path;
}
function verify(options) {
diff --git a/service-workers/service-worker/resources/resource-timing-iframe.sub.html b/service-workers/service-worker/resources/resource-timing-iframe.sub.html
index 4b62657..41bc2e7 100644
--- a/service-workers/service-worker/resources/resource-timing-iframe.sub.html
+++ b/service-workers/service-worker/resources/resource-timing-iframe.sub.html
@@ -3,8 +3,8 @@
<script src="dummy.js"></script>
<script src="redirect.py?Redirect=empty.js"></script>
<img src="square.png">
-<img src="https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/square.png">
+<img src="https://{{hosts[alt][]}}:{{ports[https][0]}}/service-workers/service-worker/resources/square.png">
<img src="missing.jpg">
-<img src="https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/missing.jpg">
+<img src="https://{{hosts[alt][]}}:{{ports[https][0]}}/service-workers/service-worker/resources/missing.jpg">
<img src='missing.jpg?SWRespondsWithFetch'>
<script src='empty-worker.js'></script>