test: refactor all tests that depends on crypto

we had a few ways versions of looking for support before executing a test. this commit unifies them as well as add the check for all tests that previously lacked them. found by running `./configure --without-ssl && make test`. also, produce tap skip output if the test is skipped. PR-URL: #1049 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
nodejs · Mar 5, 2015 · 671fbd5 · 671fbd5
1 parent c7ad320
commit 671fbd5
Show file tree

Hide file tree

Showing 128 changed files with 751 additions and 445 deletions.
diff --git a/test/internet/test-http-https-default-ports.js b/test/internet/test-http-https-default-ports.js
@@ -1,7 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
 var https = require('https');
+
 var http = require('http');
 var gotHttpsResp = false;
 var gotHttpResp = false;

diff --git a/test/internet/test-tls-reuse-host-from-socket.js b/test/internet/test-tls-reuse-host-from-socket.js
@@ -1,7 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
 var tls = require('tls');
+
 var net = require('net');
 var connected = false;
 var secure = false;

diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js
@@ -1108,16 +1108,20 @@ assert.throws(function () {
   new SlowBuffer(smalloc.kMaxLength + 1);
 }, RangeError);
 
-// Test truncation after decode
-var crypto = require('crypto');
-
-var b1 = new Buffer('YW55=======', 'base64');
-var b2 = new Buffer('YW55', 'base64');
-
-assert.equal(
-  crypto.createHash('sha1').update(b1).digest('hex'),
-  crypto.createHash('sha1').update(b2).digest('hex')
-);
+if (common.hasCrypto) {
+  // Test truncation after decode
+  var crypto = require('crypto');
+
+  var b1 = new Buffer('YW55=======', 'base64');
+  var b2 = new Buffer('YW55', 'base64');
+
+  assert.equal(
+    crypto.createHash('sha1').update(b1).digest('hex'),
+    crypto.createHash('sha1').update(b2).digest('hex')
+  );
+} else {
+  console.log('1..0 # Skipped: missing crypto');
+}
 
 // Test Compare
 var b = new Buffer(1).fill('a');

diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
 

diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
@@ -6,13 +6,11 @@ var common = require('../common');
 var assert = require('assert');
 var constants = require('constants');
 
-try {
-  var crypto = require('crypto');
-  var tls = require('tls');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'binary';
 

diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
@@ -1,6 +1,10 @@
 var common = require('../common');
 var assert = require('assert');
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
 var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';

diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 function testCipher1(key) {
   // Test encryption and decryption

diff --git a/test/parallel/test-crypto-dh-odd-key.js b/test/parallel/test-crypto-dh-odd-key.js
@@ -1,7 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
 var crypto = require('crypto');
+
 var odd = new Buffer(39);
 odd.fill('A');
 

diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
@@ -2,12 +2,11 @@ var common = require('../common');
 var assert = require('assert');
 var constants = require('constants');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along

diff --git a/test/parallel/test-crypto-domain.js b/test/parallel/test-crypto-domain.js
@@ -2,12 +2,11 @@ var common = require('../common');
 var assert = require('assert');
 var domain = require('domain');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Skipping test, compiled without crypto support.');
-  return;
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
 }
+var crypto = require('crypto');
 
 function test(fn) {
   var ex = new Error('BAM');

diff --git a/test/parallel/test-crypto-domains.js b/test/parallel/test-crypto-domains.js
@@ -1,10 +1,16 @@
-var crypto = require('crypto');
+var common = require('../common');
 var domain = require('domain');
 var assert = require('assert');
 var d = domain.create();
 var expect = ['pbkdf2', 'randomBytes', 'pseudoRandomBytes']
 var errors = 0;
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
+var crypto = require('crypto');
+
 process.on('exit', function() {
   assert.equal(errors, 3);
 });

diff --git a/test/parallel/test-crypto-ecb.js b/test/parallel/test-crypto-ecb.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
 

diff --git a/test/parallel/test-crypto-from-binary.js b/test/parallel/test-crypto-from-binary.js
@@ -5,12 +5,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 var EXTERN_APEX = 0xFBEE9;
 

diff --git a/test/parallel/test-crypto-hash-stream-pipe.js b/test/parallel/test-crypto-hash-stream-pipe.js
@@ -1,7 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  process.exit();
+}
 var crypto = require('crypto');
+
 var stream = require('stream')
 var s = new stream.PassThrough();
 var h = crypto.createHash('sha1');

diff --git a/test/parallel/test-crypto-hash.js b/test/parallel/test-crypto-hash.js
@@ -3,12 +3,11 @@ var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Test hashing
 var a0 = crypto.createHash('sha1').update('Test123').digest('hex');

diff --git a/test/parallel/test-crypto-hmac.js b/test/parallel/test-crypto-hmac.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Test HMAC
 var h1 = crypto.createHmac('sha1', 'Node')

diff --git a/test/parallel/test-crypto-padding-aes256.js b/test/parallel/test-crypto-padding-aes256.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OpenSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
 

diff --git a/test/parallel/test-crypto-padding.js b/test/parallel/test-crypto-padding.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
 

diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 //
 // Test PBKDF2 with RFC 6070 test vectors (except #4)

diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
@@ -1,12 +1,11 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
 

diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js
@@ -3,12 +3,11 @@ var assert = require('assert');
 var fs = require('fs');
 var constants = require('constants');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Test certificates
 var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');

diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js
@@ -2,12 +2,11 @@ var common = require('../common');
 var assert = require('assert');
 var fs = require('fs');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Test certificates
 var certPem = fs.readFileSync(common.fixturesDir + '/test_cert.pem', 'ascii');

diff --git a/test/parallel/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
@@ -3,12 +3,11 @@ var assert = require('assert');
 var stream = require('stream');
 var util = require('util');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
 
 // Small stream to buffer converter
 function Stream2buffer(callback) {

diff --git a/test/parallel/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js
@@ -1,13 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 
-try {
-  var crypto = require('crypto');
-  var tls = require('tls');
-} catch (e) {
-  console.log('Not compiled with OPENSSL support.');
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
   process.exit();
 }
+var crypto = require('crypto');
+var tls = require('tls');
 
 crypto.DEFAULT_ENCODING = 'buffer';