Bug 1443763 [wpt PR 9897] - Fix font paths after #9718, a=testonly
authorGeoffrey Sneddon <me@gsnedders.com>
Mon, 09 Apr 2018 17:04:37 +0000
changeset 467080 11526521f96a69fe260c4ebf58297e4403b5e0f3
parent 467079 9ad0a3f43eac7cddbb51703b8cb0012ef8ff46fb
child 467081 a0bdb3af03c329185647d244ed1a69b7f4914110
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1443763
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1443763 [wpt PR 9897] - Fix font paths after #9718, a=testonly Automatic update from web-platform-testsFix font paths after #9718 (#9897) My fixup broke these and I didn't notice, le sigh. wpt-commits: d56bf782055ce808f5b19bb6d5a82c27f34e602f wpt-pr: 9897 wpt-commits: d56bf782055ce808f5b19bb6d5a82c27f34e602f wpt-pr: 9897
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/preload/download-resources.html
testing/web-platform/tests/preload/link-header-on-subresource.html
testing/web-platform/tests/preload/onload-event.html
testing/web-platform/tests/preload/preload-csp.sub.html
testing/web-platform/tests/preload/preload-default-csp.sub.html
testing/web-platform/tests/preload/preload-with-type.html
testing/web-platform/tests/preload/resources/dummy-preloads-subresource.css.sub.headers
testing/web-platform/tests/preload/single-download-preload.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -582833,33 +582833,33 @@
    "7f7c89ffad6f9bc2909d56e36b238ffcba260849",
    "testharness"
   ],
   "preload/delaying-onload-link-preload-after-discovery.html": [
    "f51c4e4894751ae3555a44cf02f28c6b918cdab8",
    "testharness"
   ],
   "preload/download-resources.html": [
-   "f4894d37e5687cdadf8aa6879cf233b8af4e84da",
+   "a8af59b5a58b04bfda533a314c9822b13b5c379b",
    "testharness"
   ],
   "preload/dynamic-adding-preload-nonce.html": [
    "b088a043cea13026f2a6aeff1e329728440f27f4",
    "testharness"
   ],
   "preload/dynamic-adding-preload-nonce.html.headers": [
    "bc989923b6d9ff44e3efbd511264a3ba9e294078",
    "support"
   ],
   "preload/dynamic-adding-preload.html": [
    "b69da90e272530d4f42bf6d9c5b3b772d1ffce48",
    "testharness"
   ],
   "preload/link-header-on-subresource.html": [
-   "ea2f018b648d77b13b8010b4ebe63cdc5f846603",
+   "e324d7511f139f6d08c1535adfe75df579ebf747",
    "testharness"
   ],
   "preload/link-header-preload-delay-onload.html": [
    "2f786770b2d0ea00c999e10afc46a85ec737d8e5",
    "testharness"
   ],
   "preload/link-header-preload-delay-onload.html.headers": [
    "80630631003ae230caab5a49c1073d7dc1e4c9aa",
@@ -582893,29 +582893,29 @@
    "05d5b064cf231613ef1942eaa77803da37fabea4",
    "testharness"
   ],
   "preload/onerror-event.html": [
    "9f85f429c75d8469ef4bad843a09a307a20c6f58",
    "testharness"
   ],
   "preload/onload-event.html": [
-   "a02dd91451d598684a91575e8b09bda81c90e43f",
+   "2b8bd3c576b4d264d30dd664a5057fbfb1fa3fd5",
    "testharness"
   ],
   "preload/preload-csp.sub.html": [
-   "6b883cf98ebedfffbc66ab01db8736b3a978ba3b",
+   "a363e5f2447bbbcef709216d1b0bbfeec003d588",
    "testharness"
   ],
   "preload/preload-default-csp.sub.html": [
-   "5dc342bc568e96a53d5d8c0259a4f3c32a9a6ae5",
+   "8b22c83cb91255a74078c643d92078695bcd4cea",
    "testharness"
   ],
   "preload/preload-with-type.html": [
-   "ede6cb60bc1fff4f5b7740f66f039c88adb23f6f",
+   "5592d7d0d7495b04753d09f7e01d34358b03e22e",
    "testharness"
   ],
   "preload/reflected-as-value.html": [
    "28b98f82200b0c3461a9ff440df454a254f5e62a",
    "testharness"
   ],
   "preload/resources/A4.ogv": [
    "cb9a48e1d53911d5be214320adfbf7596632a316",
@@ -582925,17 +582925,17 @@
    "ac876cf9750337fcde99e547f5dc1223bb200772",
    "support"
   ],
   "preload/resources/dummy-preloads-subresource.css": [
    "788dde4e1879591cdd0e8298741f30b0d12578cd",
    "support"
   ],
   "preload/resources/dummy-preloads-subresource.css.sub.headers": [
-   "74cf2e94b49905203c42c7e701bd2308997347ea",
+   "99175c5e06059af0e13bb3a7d40e5ed9e4a447fc",
    "support"
   ],
   "preload/resources/dummy.css": [
    "788dde4e1879591cdd0e8298741f30b0d12578cd",
    "support"
   ],
   "preload/resources/dummy.css.sub.headers": [
    "ac876cf9750337fcde99e547f5dc1223bb200772",
@@ -583013,17 +583013,17 @@
    "ac876cf9750337fcde99e547f5dc1223bb200772",
    "support"
   ],
   "preload/single-download-late-used-preload.html": [
    "8476855931b0148754287ca5674000a1b6a9bca2",
    "testharness"
   ],
   "preload/single-download-preload.html": [
-   "2b7af8e911957d6b49246a17ceb284b97981241e",
+   "7c11c149daba797eb7ddae3254d6166e3057e66a",
    "testharness"
   ],
   "presentation-api/OWNERS": [
    "eb843cb769d0cffb96e4f8d209dd7aded20ec9f5",
    "support"
   ],
   "presentation-api/README.md": [
    "b3c2cfeb85e33363dc0d5b411e1c3603cdf70c96",
--- a/testing/web-platform/tests/preload/download-resources.html
+++ b/testing/web-platform/tests/preload/download-resources.html
@@ -3,31 +3,31 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/preload/resources/preload_helper.js"></script>
 <script>
     var t = async_test('Makes sure that preloaded resources are downloaded');
 </script>
 <link rel=preload href="resources/dummy.js" as=script>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
 <link rel=preload href="resources/dummy.xml?foo=bar" as=foobarxmlthing>
 <link rel=preload href="resources/dummy.xml?novalue">
 <link rel=preload href="resources/dummy.xml" as="fetch">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d5)&download-resources"></script>
 <script>
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport()
         verifyNumberOfDownloads("resources/dummy.js", 1);
         verifyNumberOfDownloads("resources/dummy.css", 1);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 1);
         verifyNumberOfDownloads("resources/white.mp4", 1);
         verifyNumberOfDownloads("resources/sound_5.oga", 1);
         verifyNumberOfDownloads("resources/foo.vtt", 1);
         verifyNumberOfDownloads("resources/dummy.xml?foo=bar", 0);
         verifyNumberOfDownloads("resources/dummy.xml?novalue", 0);
         verifyNumberOfDownloads("resources/dummy.xml", 1);
         t.done();
     }));
--- a/testing/web-platform/tests/preload/link-header-on-subresource.html
+++ b/testing/web-platform/tests/preload/link-header-on-subresource.html
@@ -5,13 +5,13 @@
 <script>
     var t = async_test('Makes sure that Link headers on subresources preload resources');
 </script>
 <link rel=stylesheet href="resources/dummy-preloads-subresource.css?link-header-on-subresource">
 <script src="resources/dummy.js?pipe=trickle(d5)&link-header-on-subresources"></script>
 <script>
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport();
-        verifyNumberOfDownloads("/preload/resources/CanvasTest.ttf?link-header-on-subresource", 1);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf?link-header-on-subresource", 1);
         t.done();
     }));
 </script>
 
--- a/testing/web-platform/tests/preload/onload-event.html
+++ b/testing/web-platform/tests/preload/onload-event.html
@@ -14,17 +14,17 @@
     var gibberishLoaded = false;
     var gibberishErrored = false;
     var noTypeLoaded = false;
     var fetchLoaded = false;
 </script>
 <link rel=preload href="resources/dummy.js" as=script onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin onload="fontLoaded = true;">
 <link rel=preload href="resources/white.mp4" as=video onload="videoLoaded = true;">
 <link rel=preload href="resources/sound_5.oga" as=audio onload="audioLoaded = true;">
 <link rel=preload href="resources/foo.vtt" as=track onload="trackLoaded = true;">
 <link rel=preload href="resources/dummy.xml?foo=bar" as=foobarxmlthing onload="gibberishLoaded = true;" onerror="gibberishErrored = true;">
 <link rel=preload href="resources/dummy.xml?fetch" as=fetch onload="fetchLoaded = true;">
 <link rel=preload href="resources/dummy.xml" onload="noTypeLoaded = true;">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d5)&onload-event"></script>
--- a/testing/web-platform/tests/preload/preload-csp.sub.html
+++ b/testing/web-platform/tests/preload/preload-csp.sub.html
@@ -4,31 +4,31 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/preload/resources/preload_helper.js"></script>
 <script>
     var t = async_test('Makes sure that preload requests respect CSP');
 </script>
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
 <link rel=preload href="resources/dummy.xml?foo=bar" as=foobarxmlthing>
 <link rel=preload href="resources/dummy.xml">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d5)&preload-csp"></script>
 <script>
     window.onload = t.step_func(function() {
         verifyPreloadAndRTSupport();
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);
         verifyNumberOfDownloads("resources/dummy.xml", 0);
         t.done();
     });
 </script>
 
--- a/testing/web-platform/tests/preload/preload-default-csp.sub.html
+++ b/testing/web-platform/tests/preload/preload-default-csp.sub.html
@@ -4,31 +4,31 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/preload/resources/preload_helper.js"></script>
 <script>
     var t = async_test('Makes sure that preload requests respect CSP');
 </script>
 <link rel=preload href="{{host}}:{{ports[http][1]}}/preload/resources/dummy.js" as=style>
 <link rel=preload href="resources/dummy.css" as=style>
 <link rel=preload href="resources/square.png" as=image>
-<link rel=preload href="resources/CanvasTest.ttf" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font crossorigin>
 <link rel=preload href="resources/white.mp4" as=video>
 <link rel=preload href="resources/sound_5.oga" as=audio>
 <link rel=preload href="resources/foo.vtt" as=track>
 <link rel=preload href="resources/dummy.xml?foo=bar" as=foobarxmlthing>
 <link rel=preload href="resources/dummy.xml">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d5)&preload-default-csp"></script>
 <script>
     window.onload = t.step_func(function() {
         verifyPreloadAndRTSupport();
         verifyNumberOfDownloads("{{host}}:{{ports[http][1]}}/preload/resources/dummy.js", 0);
         verifyNumberOfDownloads("resources/dummy.css", 0);
         verifyNumberOfDownloads("resources/square.png", 0);
-        verifyNumberOfDownloads("resources/CanvasTest.ttf", 0);
+        verifyNumberOfDownloads("/fonts/CanvasTest.ttf", 0);
         verifyNumberOfDownloads("resources/white.mp4", 0);
         verifyNumberOfDownloads("resources/sound_5.oga", 0);
         verifyNumberOfDownloads("resources/foo.vtt", 0);
         verifyNumberOfDownloads("resources/dummy.xml", 0);
         t.done();
     });
 </script>
 
--- a/testing/web-platform/tests/preload/preload-with-type.html
+++ b/testing/web-platform/tests/preload/preload-with-type.html
@@ -26,26 +26,26 @@
     var videoURL = getVideoURI("resources/A4");
     var audioURL = getAudioURI("resources/sound_5");
     var videoFormat = getFormat(videoURL);
     var audioFormat = getFormat(audioURL);
 </script>
 <link rel=preload href="resources/dummy.js" as=script type="text/javascript" onload="scriptLoaded = true;">
 <link rel=preload href="resources/dummy.css" as=style type="text/css" onload="styleLoaded = true;">
 <link rel=preload href="resources/square.png" as=image type="image/png" onload="imageLoaded = true;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/ttf" crossorigin onload="fontLoaded = true;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/' + videoFormat + '" onload="videoLoaded = true;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/' + audioFormat + '" onload="audioLoaded = true;">');
 </script>
 <link rel=preload href="resources/foo.vtt" as=track type="text/vtt" onload="trackLoaded = true;">
 <link rel=preload href="resources/dummy.js" as=script type="application/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/dummy.css" as=style type="text/foobar" onload="gibberishLoaded++;">
 <link rel=preload href="resources/square.png" as=image type="image/foobar" onload="gibberishLoaded++;">
-<link rel=preload href="resources/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
+<link rel=preload href="/fonts/CanvasTest.ttf" as=font type="font/foobar" crossorigin onload="gibberishLoaded++;">
 <script>
     document.write('<link rel=preload href="' + videoURL + '" as=video type="video/foobar" onload="gibberishLoaded++;">');
     document.write('<link rel=preload href="' + audioURL + '" as=audio type="audio/foobar" onload="gibberishLoaded++;">');
 </script>
 <link rel=preload href="resources/foo.vtt" as=track type="text/foobar" onload="gibberishLoaded++;">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d5)&preload-with-type"></script>
 <script>
--- a/testing/web-platform/tests/preload/resources/dummy-preloads-subresource.css.sub.headers
+++ b/testing/web-platform/tests/preload/resources/dummy-preloads-subresource.css.sub.headers
@@ -1,2 +1,2 @@
 Cache-Control: max-age=1000
-Link: </preload/resources/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
+Link: </fonts/CanvasTest.ttf?link-header-on-subresource>; rel=preload;as=font;crossorigin
--- a/testing/web-platform/tests/preload/single-download-preload.html
+++ b/testing/web-platform/tests/preload/single-download-preload.html
@@ -4,33 +4,33 @@
 <script src="/preload/resources/preload_helper.js"></script>
 <script>
     var t = async_test('Makes sure that preloaded resources are not downloaded again when used');
 </script>
 <link rel=preload href="resources/dummy.js?single-download-preload" as=script>
 <link rel=preload href="resources/dummy.css?single-download-preload" as=style>
 <link rel=preload href="resources/square.png?single-download-preload" as=image>
 <link rel=preload href="resources/square.png?background&single-download-preload" as=image>
-<link rel=preload href="resources/CanvasTest.ttf?single-download-preload" as=font crossorigin>
+<link rel=preload href="/fonts/CanvasTest.ttf?single-download-preload" as=font crossorigin>
 <link rel=preload href="resources/white.mp4?single-download-preload" as=video>
 <link rel=preload href="resources/sound_5.oga?single-download-preload" as=audio>
 <link rel=preload href="resources/foo.vtt?single-download-preload" as=track>
 <link rel=preload href="resources/dummy.xml?foo=bar" as=foobarxmlthing>
 <link rel=preload href="resources/dummy.xml?single-download-preload">
 <body>
 <script src="resources/dummy.js?pipe=trickle(d3)&single-download-preload"></script>
 <style>
     #background {
         width: 200px;
         height: 200px;
         background-image: url(resources/square.png?backgroundi&single-download-preload);
     }
     @font-face {
       font-family:ahem;
-      src: url(resources/CanvasTest.ttf?single-download-preload);
+      src: url(/fonts/CanvasTest.ttf?single-download-preload);
     }
     span { font-family: ahem, Arial; }
 </style>
 <link rel="stylesheet" href="resources/dummy.css?single-download-preload">
 <script src="resources/dummy.js?single-download-preload"></script>
 <div id="background"></div>
 <img src="resources/square.png?single-download-preload">
 <video src="resources/white.mp4?single-download-preload">
@@ -44,17 +44,17 @@
 
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport();
         setTimeout(t.step_func(function() {
             verifyNumberOfDownloads("resources/dummy.js?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.css?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?single-download-preload", 1);
             verifyNumberOfDownloads("resources/square.png?background&single-download-preload", 1);
-            verifyNumberOfDownloads("resources/CanvasTest.ttf?single-download-preload", 1);
+            verifyNumberOfDownloads("/fonts/CanvasTest.ttf?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?foobar", 0);
             verifyNumberOfDownloads("resources/foo.vtt?single-download-preload", 1);
             verifyNumberOfDownloads("resources/dummy.xml?single-download-preload", 1);
             // FIXME: We should verify for video and audio as well, but they seem to (flakily?) trigger multiple partial requests.
             t.done();
         }), 0);
     }));
 </script>