This CL handles the timeout problem with Subresource fetching from

a WebBundle. The problem is: when Web Bundle fetching fails due to a network error, Subresource fetch requests timeout instead of failing right away. One such case (subresource-loading-cors-error test) was timing out previously but passes successfully with this change. This CL also adds 2 WPT tests: 1. subresource-loading-network-error.https.tentative.sub.html 2. subresource-loading-web-bundle-fetch-failed.https.tentative.html Test #1 is a scenario with a different network error than the CORS one, but with the same issue of subresource fetching timing out without the change. It passes successfully after the change. Test #2 is a scenario with a Web bundle not found error, which is not directly influenced by the code added in this CL, but it expands the test coverage which was found to be lacking the error cases before. Bug: 1168449 Change-Id: Ia3abb967e36274becc86e317bc51b1272d3ae679
web-platform-tests · Apr 22, 2021 · 5762758 · 5762758
1 parent 66485c7
commit 5762758
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 0 deletions.
diff --git a/web-bundle/subresource-loading/subresource-loading-network-error.https.tentative.sub.html b/web-bundle/subresource-loading/subresource-loading-network-error.https.tentative.sub.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Web Bundle fetching failed due to a network error</title>
+<link rel="help" href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helpers.js"></script>
+
+<body>
+  <!--
+       This test uses a non-existing WebBundle from a non-existent host, which makes
+       Web Bundle fetching fail due to a network error. The intent of is to chech if
+       failing to fetch a WebBundle also makes subresource fetch requests fail.
+  -->
+  <script>
+    promise_test(async () => {
+      const prefix =
+        "https://{{hosts[][nonexistent]}}/";
+      const resources = [
+        prefix + "resource.js",
+      ];
+      const link = await addLinkAndWaitForError(
+        prefix + "non-existing.wbn",
+        resources,
+        undefined
+      );
+
+      // Can not fetch a subresource because Web Bundle fetch failed.
+      await fetchAndWaitForReject(prefix + "resource.js");
+    }, "Subresource fetch requests for non-existing Web Bundle should fail.");
+  </script>
+</body>
diff --git a/...ndle/subresource-loading/subresource-loading-web-bundle-fetch-failed.https.tentative.html b/...ndle/subresource-loading/subresource-loading-web-bundle-fetch-failed.https.tentative.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>Web Bundle fetching failed due to not found error</title>
+<link rel="help" href="https://github.com/WICG/webpackage/blob/master/explainers/subresource-loading.md" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helpers.js"></script>
+
+<body>
+  <!--
+       This test uses a non-existing WebBundle,
+       https://web-platform.test:8444/web-bundle/resources/wbn/cors/non-existing.wbn.
+
+       The intent of this test is to check if failing to fetch a WebBundle due to not
+       found error also makes subresource fetch requests fail.
+  -->
+  <script>
+    promise_test(async () => {
+      const prefix =
+        "https://web-platform.test:8444/web-bundle/resources/wbn/";
+      const resources = [
+        prefix + "resource.js",
+      ];
+      const link = await addLinkAndWaitForError(
+        prefix + "non-existing.wbn",
+        resources,
+        undefined
+      );
+
+      // Can not fetch a subresource because Web Bundle fetch failed.
+      await fetchAndWaitForReject(prefix + "resource.js");
+    }, "Subresource fetch requests for non-existing Web Bundle should fail.");
+  </script>
+</body>