24 files changed, 2 insertions, 31 deletions
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures.worker.js
deleted file mode 100644
index 705664c2d92..00000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures.worker.js
+++ /dev/null
@@ -1,5 +0,0 @@
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test();
-done();
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js
index 7bb3e7f697f..7bb3e7f697f 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js
index f6766b27bba..f6766b27bba 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js
index 1383e589559..1383e589559 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js
index 04f5bb6edab..04f5bb6edab 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js
index a7e6a7240bc..a7e6a7240bc 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js
index a1f471141de..a1f471141de 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js
index 9dfbbb9c065..9dfbbb9c065 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js
index 39de6d6efec..39de6d6efec 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js
index 8b1110d7f09..8b1110d7f09 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js
index 4df0b896fe3..4df0b896fe3 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.worker.js
deleted file mode 100644
index 52e34946ef0..00000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test();
-done();
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js
index 0710c9e7b50..0710c9e7b50 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js
index 51529f000fd..51529f000fd 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js
index 1f6a1bc96e0..1f6a1bc96e0 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js
index 058cf83d057..058cf83d057 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js
index a21b7d04e8b..a21b7d04e8b 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js
index 13f7e3539ec..13f7e3539ec 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js
index 2b50b909058..2b50b909058 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js
index 4b3538da689..4b3538da689 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js
index 52364f5c7f5..52364f5c7f5 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js
index 4c6a02a98c6..4c6a02a98c6 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.worker.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures.https.html
deleted file mode 100644
index 14e57b25cf2..00000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test();
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html
index 48136260390..db58fd6690a 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html
@@ -19,5 +19,5 @@
 
 <div id="log"></div>
 <script>
-run_test(["RSA-OAEP"], true);
-</script>
+run_test(["RSA-OAEP"]);
+</script>
+\ No newline at end of file