aboutsummaryrefslogtreecommitdiff
path: root/test/parallel/test-tls-junk-server.js
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-09-17 18:48:25 -0400
committerRod Vagg <rod@vagg.org>2017-11-11 20:42:49 +1100
commitffb8f031a4559f89b6967e3a1eb0cbdb24657bb0 (patch)
tree2d7fb6fbe7f1a20cb3d567f3cce92bec9d0b25d9 /test/parallel/test-tls-junk-server.js
parent5fe81c8aff03261f6443580dbc08f608013718c6 (diff)
downloadandroid-node-v8-ffb8f031a4559f89b6967e3a1eb0cbdb24657bb0.tar.gz
android-node-v8-ffb8f031a4559f89b6967e3a1eb0cbdb24657bb0.tar.bz2
android-node-v8-ffb8f031a4559f89b6967e3a1eb0cbdb24657bb0.zip
test: update test expectations for OpenSSL 1.1.0
Some errors in the two versions are different. The test-tls-no-sslv3 one because OpenSSL 1.1.x finally does version negotiation properly. 1.0.x's logic was somewhat weird and resulted in very inconsistent errors for SSLv3 in particular. Also the function codes are capitalized differently, but function codes leak implementation details, so don't assert on them to begin with. PR-URL: https://github.com/nodejs/node/pull/16130 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'test/parallel/test-tls-junk-server.js')
-rw-r--r--test/parallel/test-tls-junk-server.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/parallel/test-tls-junk-server.js b/test/parallel/test-tls-junk-server.js
index 3270dec745..27c273857b 100644
--- a/test/parallel/test-tls-junk-server.js
+++ b/test/parallel/test-tls-junk-server.js
@@ -21,7 +21,9 @@ server.listen(0, function() {
req.end();
req.once('error', common.mustCall(function(err) {
- assert(/unknown protocol/.test(err.message));
+ // OpenSSL 1.0.x and 1.1.x use different error messages for junk inputs.
+ assert(/unknown protocol/.test(err.message) ||
+ /wrong version number/.test(err.message));
server.close();
}));
});