Skip to content

Commit

Permalink
WebCryptoAPI: Use .any.js for generateKey tests and split up slow tests
Browse files Browse the repository at this point in the history
Slow tests test 10 subtests at a time, using the `// META: variant=...`
feature.

Fixes #10794.
  • Loading branch information
zcorpan committed May 14, 2018
1 parent c4eab55 commit e2bae53
Show file tree
Hide file tree
Showing 63 changed files with 118 additions and 587 deletions.
4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["AES-CBC"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["AES-CTR"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["AES-GCM"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_AES-KW.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["AES-KW"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_ECDH.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["ECDH"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_ECDH.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_ECDSA.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["ECDSA"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_HMAC.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["HMAC"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_HMAC.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["RSA-OAEP"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["RSA-PSS"]);
6 changes: 0 additions & 6 deletions WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=failures.js
run_test(["RSASSA-PKCS1-v1_5"]);

This file was deleted.

15 changes: 14 additions & 1 deletion WebCryptoAPI/generateKey/successes.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ function run_test(algorithmNames, slowTest) {
}, testTag + ": generateKey" + parameterString(algorithm, extractable, usages));
}

// Only test a subset of tests with, e.g., ?1-10 in the URL
var subTestStart = 0;
var subTestEnd = Infinity;
var match;
if (location.search) {
match = /^\?(\d+)-(\d+)$/.exec(location.search);
subTestStart = match[1];
subTestEnd = match[2];
}
var currentSubTest = 0;

// Test all valid sets of parameters for successful
// key generation.
Expand All @@ -78,7 +88,10 @@ function run_test(algorithmNames, slowTest) {
allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
allValidUsages(vector.usages, false, vector.mandatoryUsages).forEach(function(usages) {
[false, true].forEach(function(extractable) {
testSuccess(algorithm, extractable, usages, vector.resultType, "Success");
currentSubTest++;
if (currentSubTest >= subTestStart && currentSubTest <= subTestEnd) {
testSuccess(algorithm, extractable, usages, vector.resultType, "Success");
}
});
});
});
Expand Down
4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["AES-CBC"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["AES-CTR"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["AES-GCM"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_AES-KW.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["AES-KW"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_ECDH.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["ECDH"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_ECDH.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_ECDSA.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["ECDSA"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js

This file was deleted.

4 changes: 4 additions & 0 deletions WebCryptoAPI/generateKey/successes_HMAC.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// META: timeout=long
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["HMAC"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_HMAC.https.worker.js

This file was deleted.

20 changes: 20 additions & 0 deletions WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// META: timeout=long
// META: variant=?1-10
// META: variant=?11-20
// META: variant=?21-30
// META: variant=?31-40
// META: variant=?41-50
// META: variant=?51-60
// META: variant=?61-70
// META: variant=?71-80
// META: variant=?81-90
// META: variant=?91-100
// META: variant=?101-110
// META: variant=?111-120
// META: variant=?121-130
// META: variant=?131-140
// META: variant=?141-150
// META: variant=?151-156
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["RSA-OAEP"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js

This file was deleted.

8 changes: 8 additions & 0 deletions WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// META: timeout=long
// META: variant=?1-10
// META: variant=?11-20
// META: variant=?21-30
// META: variant=?31-36
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["RSA-PSS"]);
7 changes: 0 additions & 7 deletions WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// META: timeout=long
// META: variant=?1-10
// META: variant=?11-20
// META: variant=?21-30
// META: variant=?31-36
// META: script=../util/helpers.js
// META: script=successes.js
run_test(["RSASSA-PKCS1-v1_5"]);

This file was deleted.

23 changes: 0 additions & 23 deletions WebCryptoAPI/generateKey/test_aes-cbc.https.html

This file was deleted.

23 changes: 0 additions & 23 deletions WebCryptoAPI/generateKey/test_aes-ctr.https.html

This file was deleted.

18 changes: 0 additions & 18 deletions WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html

This file was deleted.

Loading

0 comments on commit e2bae53

Please sign in to comment.