Title: [260618] trunk/LayoutTests
- Revision
- 260618
- Author
- [email protected]
- Date
- 2020-04-23 21:46:07 -0700 (Thu, 23 Apr 2020)
Log Message
Use shouldRejectWithErrorName after r260579.
The mentioned revision made shouldRejectWithErrorName (and
shouldReject) actually omit the error name when it was not requested.
So now to catch the desired error we must actually request it
instead of just relying on the expectation file messages.
Unreviewed test gardening.
* crypto/subtle/ecdh-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html:
* crypto/subtle/ecdh-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html:
* crypto/subtle/ecdsa-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html:
* crypto/subtle/ecdsa-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (260617 => 260618)
--- trunk/LayoutTests/ChangeLog 2020-04-24 03:31:10 UTC (rev 260617)
+++ trunk/LayoutTests/ChangeLog 2020-04-24 04:46:07 UTC (rev 260618)
@@ -1,3 +1,20 @@
+2020-04-23 Lauro Moura <[email protected]>
+
+ Use shouldRejectWithErrorName after r260579.
+
+ The mentioned revision made shouldRejectWithErrorName (and
+ shouldReject) actually omit the error name when it was not requested.
+
+ So now to catch the desired error we must actually request it
+ instead of just relying on the expectation file messages.
+
+ Unreviewed test gardening.
+
+ * crypto/subtle/ecdh-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html:
+ * crypto/subtle/ecdh-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html:
+ * crypto/subtle/ecdsa-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html:
+ * crypto/subtle/ecdsa-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html:
+
2020-04-23 Simon Fraser <[email protected]>
EventHandler::selectCursor() has broken resize over coordinate conversion code
Modified: trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html (260617 => 260618)
--- trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html 2020-04-24 03:31:10 UTC (rev 260617)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html 2020-04-24 04:46:07 UTC (rev 260618)
@@ -42,16 +42,16 @@
testPassed("Successfully imported a P-256 key.");
debug("ECDH: importing P-256 key whose curve identifiers in ECParameters structures in PKCS#8 don't match ...");
- return shouldReject('importKey(pkcs8P256KeyMismatchedCurveIdentifiers)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyMismatchedCurveIdentifiers)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-256 key that has a public key in PKCS#8 of invalid length ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKeyLength)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKeyLength)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-256 key that has a public key in PKCS#8 of invalid EC point format ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKeyECPointFormat)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKeyECPointFormat)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-256 key that has an invalid public key in PKCS#8 ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKey)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKey)', 'DataError');
}).then(function(result) {
finishJSTest();
});;
Modified: trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html (260617 => 260618)
--- trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html 2020-04-24 03:31:10 UTC (rev 260617)
+++ trunk/LayoutTests/crypto/subtle/ecdh-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html 2020-04-24 04:46:07 UTC (rev 260618)
@@ -42,16 +42,16 @@
testPassed("Successfully imported a P-384 key.");
debug("ECDH: importing P-384 key whose curve identifiers in ECParameters structures in PKCS#8 don't match ...");
- return shouldReject('importKey(pkcs8P384KeyMismatchedCurveIdentifiers)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyMismatchedCurveIdentifiers)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-384 key that has a public key in PKCS#8 of invalid length ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKeyLength)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKeyLength)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-384 key that has a public key in PKCS#8 of invalid EC point format ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKeyECPointFormat)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKeyECPointFormat)', 'DataError');
}).then(function(result) {
debug("ECDH: importing P-384 key that has an invalid public key in PKCS#8 ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKey)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKey)', 'DataError');
}).then(function(result) {
finishJSTest();
});;
Modified: trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html (260617 => 260618)
--- trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html 2020-04-24 03:31:10 UTC (rev 260617)
+++ trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p256-validate-ecprivatekey-parameters-publickey.html 2020-04-24 04:46:07 UTC (rev 260618)
@@ -42,16 +42,16 @@
testPassed("Successfully imported a P-256 key.");
debug("ECDSA: importing P-256 key whose curve identifiers in ECParameters structures in PKCS#8 don't match ...");
- return shouldReject('importKey(pkcs8P256KeyMismatchedCurveIdentifiers)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyMismatchedCurveIdentifiers)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-256 key that has a public key in PKCS#8 of invalid length ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKeyLength)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKeyLength)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-256 key that has a public key in PKCS#8 of invalid EC point format ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKeyECPointFormat)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKeyECPointFormat)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-256 key that has an invalid public key in PKCS#8 ...");
- return shouldReject('importKey(pkcs8P256KeyInvalidPublicKey)');
+ return shouldRejectWithErrorName('importKey(pkcs8P256KeyInvalidPublicKey)', 'DataError');
}).then(function(result) {
finishJSTest();
});;
Modified: trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html (260617 => 260618)
--- trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html 2020-04-24 03:31:10 UTC (rev 260617)
+++ trunk/LayoutTests/crypto/subtle/ecdsa-import-pkcs8-key-p384-validate-ecprivatekey-parameters-publickey.html 2020-04-24 04:46:07 UTC (rev 260618)
@@ -42,16 +42,16 @@
testPassed("Successfully imported a P-384 key.");
debug("ECDSA: importing P-384 key whose curve identifiers in ECParameters structures in PKCS#8 don't match ...");
- return shouldReject('importKey(pkcs8P384KeyMismatchedCurveIdentifiers)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyMismatchedCurveIdentifiers)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-384 key that has a public key in PKCS#8 of invalid length ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKeyLength)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKeyLength)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-384 key that has a public key in PKCS#8 of invalid EC point format ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKeyECPointFormat)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKeyECPointFormat)', 'DataError');
}).then(function(result) {
debug("ECDSA: importing P-384 key that has an invalid public key in PKCS#8 ...");
- return shouldReject('importKey(pkcs8P384KeyInvalidPublicKey)');
+ return shouldRejectWithErrorName('importKey(pkcs8P384KeyInvalidPublicKey)', 'DataError');
}).then(function(result) {
finishJSTest();
});;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
