Skip to content

Commit

Permalink
test: fix tests for non-crypto builds
Browse files Browse the repository at this point in the history
Fix running the tests when node was compiled without crypto
support. Some of these are cleanup after 52bae22, where
common was used before it was required.

PR-URL: #7056
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
addaleax committed Jun 8, 2016
1 parent d9e0d8b commit 15cd45c
Show file tree
Hide file tree
Showing 22 changed files with 101 additions and 20 deletions.
5 changes: 5 additions & 0 deletions test/parallel/test-async-wrap-check-providers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const crypto = require('crypto');
const dgram = require('dgram');
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-async-wrap-post-did-throw.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const async_wrap = process.binding('async_wrap');
var asyncThrows = 0;
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-async-wrap-throw-from-callback.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const async_wrap = process.binding('async_wrap');
const assert = require('assert');
const crypto = require('crypto');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-crypto-rsa-dsa.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
var common = require('../common');
var assert = require('assert');
var fs = require('fs');
var constants = require('crypto').constants;

if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
var constants = require('crypto').constants;
var crypto = require('crypto');

// Test certificates
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-http-invalid-urls.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const http = require('http');
const https = require('https');
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-https-agent-getname.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const https = require('https');

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-https-connect-address-family.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const https = require('https');

Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-https-resume-after-renew.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
'use strict';
var common = require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

var fs = require('fs');
var https = require('https');
var crypto = require('crypto');
Expand Down
6 changes: 5 additions & 1 deletion test/parallel/test-net-access-byteswritten.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
const assert = require('assert');
const net = require('net');
const tls = require('tls');
Expand Down
4 changes: 4 additions & 0 deletions test/parallel/test-npm-install.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const path = require('path');
const spawn = require('child_process').spawn;
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-stream-base-no-abort.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const async_wrap = process.binding('async_wrap');
const uv = process.binding('uv');
const assert = require('assert');
const common = require('../common');
const dgram = require('dgram');
const fs = require('fs');
const net = require('net');
Expand Down
11 changes: 5 additions & 6 deletions test/parallel/test-tls-async-cb-after-socket-end.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';

var common = require('../common');

var path = require('path');
var fs = require('fs');
const SSL_OP_NO_TICKET = require('crypto').constants.SSL_OP_NO_TICKET;

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const path = require('path');
const fs = require('fs');
const SSL_OP_NO_TICKET = require('crypto').constants.SSL_OP_NO_TICKET;

var tls = require('tls');

var options = {
Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-tls-basic-validations.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const tls = require('tls');

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-tls-connect-address-family.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const tls = require('tls');

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-tls-connect-stream-writes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const fs = require('fs');
const tls = require('tls');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-npn-server-client.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
const common = require('../common');
if (!process.features.tls_npn) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
return;
}

const common = require('../common');
const assert = require('assert');
const fs = require('fs');

Expand Down
6 changes: 5 additions & 1 deletion test/parallel/test-tls-parse-cert-string.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

require('../common');
const assert = require('assert');
const tls = require('tls');

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-tls-securepair-fiftharg.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const assert = require('assert');
const fs = require('fs');
const tls = require('tls');
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-sni-option.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
const common = require('../common');
if (!process.features.tls_sni) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
return;
}

const common = require('../common');
const assert = require('assert');
const fs = require('fs');

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-sni-server-client.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
const common = require('../common');
if (!process.features.tls_sni) {
common.skip('node compiled without OpenSSL or ' +
'with old OpenSSL version.');
return;
}

const common = require('../common');
const assert = require('assert');
const fs = require('fs');

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-tls-two-cas-one-string.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const tls = require('tls');
const fs = require('fs');

Expand Down
7 changes: 6 additions & 1 deletion test/parallel/test-tls-wrap-no-abort.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}

const util = require('util');
const TLSWrap = process.binding('tls_wrap').TLSWrap;

Expand Down

0 comments on commit 15cd45c

Please sign in to comment.