Bug 1456468 [wpt PR 10600] - Fetch: use new any.js for general abort test, a=testonly
authorAnne van Kesteren <annevk@annevk.nl>
Tue, 01 May 2018 14:18:03 +0000
changeset 472629 6f706f86c0fc2cc81bea4c8859424ba6c73a68b3
parent 472628 99ec68dd3a38eb548c453e0dd3888185890ff844
child 472630 1e379aba0d93b62931a9cd2426634229853573a5
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1456468, 10600
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 1456468 [wpt PR 10600] - Fetch: use new any.js for general abort test, a=testonly Automatic update from web-platform-testsFetch: use new any.js for general abort test -- wpt-commits: a8a88982335f854cf824f2f52a9088629b4db011 wpt-pr: 10600
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/fetch/api/abort/general-serviceworker.https.html
testing/web-platform/tests/fetch/api/abort/general-sharedworker.html
testing/web-platform/tests/fetch/api/abort/general.any.js
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -327813,36 +327813,32 @@
     ]
    ],
    "fetch/api/abort/cache.https.html": [
     [
      "/fetch/api/abort/cache.https.html",
      {}
     ]
    ],
-   "fetch/api/abort/general-serviceworker.https.html": [
-    [
-     "/fetch/api/abort/general-serviceworker.https.html",
-     {}
-    ]
-   ],
-   "fetch/api/abort/general-sharedworker.html": [
-    [
-     "/fetch/api/abort/general-sharedworker.html",
-     {}
-    ]
-   ],
    "fetch/api/abort/general.any.js": [
     [
      "/fetch/api/abort/general.any.html",
      {}
     ],
     [
+     "/fetch/api/abort/general.any.sharedworker.html",
+     {}
+    ],
+    [
      "/fetch/api/abort/general.any.worker.html",
      {}
+    ],
+    [
+     "/fetch/api/abort/general.https.any.serviceworker.html",
+     {}
     ]
    ],
    "fetch/api/abort/serviceworker-intercepted.https.html": [
     [
      "/fetch/api/abort/serviceworker-intercepted.https.html",
      {}
     ]
    ],
@@ -555840,26 +555836,18 @@
   "fetch/README.md": [
    "fc07406a432360cd0f2f7650d9d34820568809e0",
    "support"
   ],
   "fetch/api/abort/cache.https.html": [
    "9465007a35059e9d72d4ab1dd8bff0d44f47c3d6",
    "testharness"
   ],
-  "fetch/api/abort/general-serviceworker.https.html": [
-   "ea0eda077eb4a5a234ad3b97595da16aee178fc9",
-   "testharness"
-  ],
-  "fetch/api/abort/general-sharedworker.html": [
-   "96563c4324949b5dece964eaf6df0b25324e8365",
-   "testharness"
-  ],
   "fetch/api/abort/general.any.js": [
-   "e7a735978af073066872021580ececcb7f465512",
+   "83da4c7859ee4d1a6a386b75c12b8a87e1347fe8",
    "testharness"
   ],
   "fetch/api/abort/serviceworker-intercepted.https.html": [
    "ee3512098bed44d034d9a0e6f2ccdbd5a07c7e42",
    "testharness"
   ],
   "fetch/api/basic/accept-header.any.js": [
    "ab322023411faca98534f620806b2418a6767e64",
deleted file mode 100644
--- a/testing/web-platform/tests/fetch/api/abort/general-serviceworker.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>General fetch abort tests in a service worker</title>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-  (async function() {
-    const scope = 'does/not/exist';
-
-    let reg = await navigator.serviceWorker.getRegistration(scope);
-    if (reg) await reg.unregister();
-
-    reg = await navigator.serviceWorker.register('general.any.worker.js', {scope});
-
-    fetch_tests_from_worker(reg.installing);
-  })();
-</script>
-</body>
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/fetch/api/abort/general-sharedworker.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>General fetch abort tests - shared worker</title>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<script>
-  fetch_tests_from_worker(new SharedWorker("general.any.worker.js"));
-</script>
-</body>
-</html>
--- a/testing/web-platform/tests/fetch/api/abort/general.any.js
+++ b/testing/web-platform/tests/fetch/api/abort/general.any.js
@@ -1,8 +1,9 @@
+// META: global=window,worker
 // META: script=/common/utils.js
 // META: script=../request/request-error.js
 
 const BODY_METHODS = ['arrayBuffer', 'blob', 'formData', 'json', 'text'];
 
 // This is used to close connections that weren't correctly closed during the tests,
 // otherwise you can end up running out of HTTP connections.
 let requestAbortKeys = [];