From 8fa98884a68543a02a00682095b561feefa23418 Mon Sep 17 00:00:00 2001 From: Anne van Kesteren Date: Mon, 22 Jul 2019 10:22:32 +0000 Subject: [PATCH] Bug 1565151 [wpt PR 17688] - HTML: cleanup [[CanBlock]] tests, a=testonly Automatic update from web-platform-tests HTML: cleanup [[CanBlock]] tests (These do not require COOP/COEP treatment as they test SharedArrayBuffer on a single thread, but still seems nice to reduce clutter.) -- wpt-commits: e4b8a06127ec937a5a57f6f96470aabb6f8d4629 wpt-pr: 17688 --- .../canblock-dedicatedworker.html | 13 ------------ .../canblock-serviceworker.https.html | 14 ------------- .../canblock-sharedworker.html | 13 ------------ .../canblock-window.html | 21 ------------------- ...ilure.js => requires-failure.https.any.js} | 5 +---- ...res-success.js => requires-success.any.js} | 5 +---- 6 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html delete mode 100644 testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html delete mode 100644 testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html delete mode 100644 testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html rename testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/{worker-that-requires-failure.js => requires-failure.https.any.js} (76%) rename testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/{worker-that-requires-success.js => requires-success.any.js} (74%) diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html deleted file mode 100644 index 0d559999f3fa..000000000000 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-dedicatedworker.html +++ /dev/null @@ -1,13 +0,0 @@ - - -[[CanBlock]] in a dedicated worker agent - - - - - - - diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html deleted file mode 100644 index 6bfd29e8c74b..000000000000 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html +++ /dev/null @@ -1,14 +0,0 @@ - - -[[CanBlock]] in a service worker agent - - - - - - - - diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html deleted file mode 100644 index beb7c6467b24..000000000000 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-sharedworker.html +++ /dev/null @@ -1,13 +0,0 @@ - - -[[CanBlock]] in a shared worker agent - - - - - - - diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html deleted file mode 100644 index 369ce77b0b62..000000000000 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-window.html +++ /dev/null @@ -1,21 +0,0 @@ - - -[[CanBlock]] in a similar-origin window agent - - - - - - - diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js similarity index 76% rename from testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js rename to testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js index 586c8ba38764..a890b3501982 100644 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-failure.js +++ b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-failure.https.any.js @@ -1,5 +1,4 @@ -"use strict"; -importScripts("/resources/testharness.js"); +// META: global=!default,window,serviceworker test(() => { const sab = new SharedArrayBuffer(16); @@ -9,5 +8,3 @@ test(() => { Atomics.wait(ta, 0, 0, 10); }); }, `[[CanBlock]] in a ${self.constructor.name}`); - -done(); diff --git a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js similarity index 74% rename from testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js rename to testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js index 2ed54143ee55..290b44353c8a 100644 --- a/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/worker-that-requires-success.js +++ b/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/requires-success.any.js @@ -1,5 +1,4 @@ -"use strict"; -importScripts("/resources/testharness.js"); +// META: global=!default,dedicatedworker,sharedworker test(() => { const sab = new SharedArrayBuffer(16); @@ -7,5 +6,3 @@ test(() => { assert_equals(Atomics.wait(ta, 0, 0, 10), "timed-out"); }, `[[CanBlock]] in a ${self.constructor.name}`); - -done();