Bug 1485067 [wpt PR 12599] - Remove duplicate importScripts and testharness.js script in CORP test, a=testonly
authoryouennf <youennf@users.noreply.github.com>
Fri, 24 Aug 2018 12:56:16 +0000
changeset 491590 2501f9166624ee4aa9c6897c441d32ad0384bfad
parent 491589 ac00e1d7e17eeb4c49e39bfc6f4cf296752240b2
child 491591 7668d84fcc9243238669616c02b1fb1c246f2ece
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1485067, 12599
milestone63.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 1485067 [wpt PR 12599] - Remove duplicate importScripts and testharness.js script in CORP test, a=testonly Automatic update from web-platform-testsFetch: use more any.js functionality in CORP test -- wpt-commits: adc30f943e5b46b3c49efbfe7d473a9599781006 wpt-pr: 12599
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/fetch/cross-origin-resource-policy/fetch-in-service-worker.html
testing/web-platform/tests/fetch/cross-origin-resource-policy/fetch.any.js
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -352069,28 +352069,30 @@
     ]
    ],
    "fetch/cross-origin-resource-policy/fetch-in-iframe.html": [
     [
      "/fetch/cross-origin-resource-policy/fetch-in-iframe.html",
      {}
     ]
    ],
-   "fetch/cross-origin-resource-policy/fetch-in-service-worker.html": [
-    [
-     "/fetch/cross-origin-resource-policy/fetch-in-service-worker.html",
-     {}
-    ]
-   ],
    "fetch/cross-origin-resource-policy/fetch.any.js": [
     [
      "/fetch/cross-origin-resource-policy/fetch.any.html",
      {}
     ],
     [
+     "/fetch/cross-origin-resource-policy/fetch.any.serviceworker.html",
+     {}
+    ],
+    [
+     "/fetch/cross-origin-resource-policy/fetch.any.sharedworker.html",
+     {}
+    ],
+    [
      "/fetch/cross-origin-resource-policy/fetch.any.worker.html",
      {}
     ]
    ],
    "fetch/cross-origin-resource-policy/iframe-loads.html": [
     [
      "/fetch/cross-origin-resource-policy/iframe-loads.html",
      {}
@@ -586774,22 +586776,18 @@
   "fetch/cors-rfc1918/idlharness.tentative.any.js": [
    "88468dc19a38a64e6ebdb19b4e92ddf23a3247fc",
    "testharness"
   ],
   "fetch/cross-origin-resource-policy/fetch-in-iframe.html": [
    "cc6a3a81bcf4cbabfec265a1874442f53e7d8a30",
    "testharness"
   ],
-  "fetch/cross-origin-resource-policy/fetch-in-service-worker.html": [
-   "e493904e2dc6487027a8b1e6351b3f1a81e34de3",
-   "testharness"
-  ],
   "fetch/cross-origin-resource-policy/fetch.any.js": [
-   "758c52a695a03e8ee78c038bc2316fb7808f7fa1",
+   "ded3bdc5daee50fec9c970cd31f24f2bd6f2b60a",
    "testharness"
   ],
   "fetch/cross-origin-resource-policy/iframe-loads.html": [
    "63902c302b7ce6cb5a3f0fb126be2a56a830f42b",
    "testharness"
   ],
   "fetch/cross-origin-resource-policy/image-loads.html": [
    "8a0458f107abdf2b7d6664fb8194e6b4b0222989",
deleted file mode 100644
--- a/testing/web-platform/tests/fetch/cross-origin-resource-policy/fetch-in-service-worker.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<title>Cross-Origin-Resource-Policy in Service Worker</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
-<script>
-
-service_worker_test(
-    'fetch.any.js',
-    'fetch.any.js test');
-
-</script>
--- a/testing/web-platform/tests/fetch/cross-origin-resource-policy/fetch.any.js
+++ b/testing/web-platform/tests/fetch/cross-origin-resource-policy/fetch.any.js
@@ -1,15 +1,10 @@
+// META: global=window,worker
 // META: script=/common/get-host-info.sub.js
-// META: script=/resources/testharness.js
-
-if (!self.document) {
-    importScripts("/resources/testharness.js");
-    importScripts("/common/get-host-info.sub.js");
-}
 
 const host = get_host_info();
 const path = "/fetch/cross-origin-resource-policy/";
 const localBaseURL = host.HTTP_ORIGIN + path;
 const sameSiteBaseURL = "http://" + host.ORIGINAL_HOST + ":" + host.HTTP_PORT2 + path;
 const notSameSiteBaseURL = host.HTTP_NOTSAMESITE_ORIGIN + path;
 const httpsBaseURL = host.HTTPS_ORIGIN + path;