Skip to content

Commit

Permalink
test: abstract skip functionality to common
Browse files Browse the repository at this point in the history
The tap skipping output is so prevalent yet obscure in nature that we
ought to move it into it's own function in test/common.js

Re-do of 52bae22 for v4.x

Ref: #6697
PR-URL: #7114
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Fishrock123 authored and Myles Borins committed Jun 24, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent eadb7e5 commit 4067cde
Showing 219 changed files with 291 additions and 294 deletions.
Original file line number Diff line number Diff line change
@@ -8,10 +8,9 @@ const assert = require('assert');
// v8::String::kMaxLength defined in v8.h
const kStringMaxLength = process.binding('buffer').kStringMaxLength;

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

Original file line number Diff line number Diff line change
@@ -4,10 +4,9 @@ const common = require('../../common');
const binding = require('./build/Release/binding');
const assert = require('assert');

const skipMessage =
'1..0 # Skipped: intensive toString tests due to memory confinements';
const skipMessage = 'intensive toString tests due to memory confinements';
if (!common.enoughTestMem) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

@@ -20,13 +19,13 @@ try {
} catch (e) {
// If the exception is not due to memory confinement then rethrow it.
if (e.message !== 'Invalid array buffer length') throw (e);
console.log(skipMessage);
common.skip(skipMessage);
return;
}

// Ensure we have enough memory available for future allocations to succeed.
if (!binding.ensureAllocation(2 * kStringMaxLength)) {
console.log(skipMessage);
common.skip(skipMessage);
return;
}

4 changes: 4 additions & 0 deletions test/common.js
Original file line number Diff line number Diff line change
@@ -459,6 +459,10 @@ exports.fail = function(msg) {
assert.fail(null, null, msg);
};

exports.skip = function(msg) {
console.log(`1..0 # Skipped: ${msg}`);
};

// Returns true if the exit code "exitCode" and/or signal name "signal"
// represent the exit code and/or signal name of a node process that aborted,
// false otherwise.
2 changes: 1 addition & 1 deletion test/disabled/tls_server.js
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ var certPem = fs.readFileSync(common.fixturesDir + '/cert.pem');
try {
var credentials = crypto.createCredentials({key: keyPem, cert: certPem});
} catch (e) {
console.log('1..0 # Skipped: node compiled without OpenSSL.');
common.skip('node compiled without OpenSSL.');
return;
}
var i = 0;
2 changes: 1 addition & 1 deletion test/internet/test-dgram-broadcast-multi-process.js
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ const messages = [
];

if (common.inFreeBSDJail) {
console.log('1..0 # Skipped: in a FreeBSD jail');
common.skip('in a FreeBSD jail');
return;
}

2 changes: 1 addition & 1 deletion test/internet/test-dgram-multicast-multi-process.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ const listeners = 3;

// Skip test in FreeBSD jails.
if (common.inFreeBSDJail) {
console.log('1..0 # Skipped: In a FreeBSD jail');
common.skip('In a FreeBSD jail');
return;
}

2 changes: 1 addition & 1 deletion test/internet/test-dns-ipv6.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ let running = false;
const queue = [];

if (!common.hasIPv6) {
console.log('1..0 # Skipped: this test, no IPv6 support');
common.skip('this test, no IPv6 support');
return;
}

2 changes: 1 addition & 1 deletion test/internet/test-http-https-default-ports.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ var common = require('../common');
var assert = require('assert');

if (!common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
common.skip('missing crypto');
return;
}
var https = require('https');
2 changes: 1 addition & 1 deletion test/internet/test-tls-connnect-cnnic.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

var common = require('../common');
if (!common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
common.skip('missing crypto');
return;
}

2 changes: 1 addition & 1 deletion test/internet/test-tls-connnect-melissadata.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

var common = require('../common');
if (!common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
common.skip('missing crypto');
return;
}

2 changes: 1 addition & 1 deletion test/internet/test-tls-reuse-host-from-socket.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ var common = require('../common');
var assert = require('assert');

if (!common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
common.skip('missing crypto');
return;
}
var tls = require('tls');
2 changes: 1 addition & 1 deletion test/parallel/test-buffer.js
Original file line number Diff line number Diff line change
@@ -1273,7 +1273,7 @@ if (common.hasCrypto) {
crypto.createHash('sha1').update(b2).digest('hex')
);
} else {
console.log('1..0 # Skipped: missing crypto');
common.skip('missing crypto');
}

// Test Compare
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-fork-dgram.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ var assert = require('assert');
var common = require('../common');

if (common.isWindows) {
console.log('1..0 # Skipped: Sending dgram sockets to child processes is ' +
common.skip('Sending dgram sockets to child processes is ' +
'not supported');
return;
}
4 changes: 2 additions & 2 deletions test/parallel/test-cluster-bind-privileged-port.js
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@ var cluster = require('cluster');
var net = require('net');

if (common.isWindows) {
console.log('1..0 # Skipped: not reliable on Windows.');
common.skip('not reliable on Windows.');
return;
}

if (process.getuid() === 0) {
console.log('1..0 # Skipped: Test is not supposed to be run as root.');
common.skip('Test is not supposed to be run as root.');
return;
}

2 changes: 1 addition & 1 deletion test/parallel/test-cluster-dgram-1.js
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ var dgram = require('dgram');


if (common.isWindows) {
console.log('1..0 # Skipped: dgram clustering is currently not supported ' +
common.skip('dgram clustering is currently not supported ' +
'on windows.');
return;
}
2 changes: 1 addition & 1 deletion test/parallel/test-cluster-dgram-2.js
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ var dgram = require('dgram');


if (common.isWindows) {
console.log('1..0 # Skipped: dgram clustering is currently not supported ' +
common.skip('dgram clustering is currently not supported ' +
'on windows.');
return;
}
2 changes: 1 addition & 1 deletion test/parallel/test-cluster-dgram-reuse.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ const cluster = require('cluster');
const dgram = require('dgram');

if (common.isWindows) {
console.log('1..0 # Skipped: dgram clustering is currently not supported ' +
common.skip('dgram clustering is currently not supported ' +
'on windows.');
return;
}
2 changes: 1 addition & 1 deletion test/parallel/test-cluster-disconnect-handles.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ const net = require('net');
const Protocol = require('_debugger').Protocol;

if (common.isWindows) {
console.log('1..0 # Skipped: SCHED_RR not reliable on Windows');
common.skip('SCHED_RR not reliable on Windows');
return;
}

2 changes: 1 addition & 1 deletion test/parallel/test-cluster-disconnect-race.js
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ const net = require('net');
const cluster = require('cluster');

if (common.isWindows) {
console.log('1..0 # Skipped: This test does not apply to Windows.');
common.skip('This test does not apply to Windows.');
return;
}

Loading

0 comments on commit 4067cde

Please sign in to comment.