Skip to content

Commit 69298d3

Browse files
committed
test: formatting skip messages for TAP parsing
This patch makes the skip messages consistent so that the TAP plugin in CI can parse the messages properly. The format will be 1..0 # Skipped: [Actual reason why the test is skipped] PR-URL: #2109 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Johan Bergström <[email protected]>
1 parent 6b85d5a commit 69298d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+62
-62
lines changed

test/parallel/test-cluster-bind-privileged-port.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var cluster = require('cluster');
55
var net = require('net');
66

77
if (process.platform === 'win32') {
8-
console.log('Skipping test, not reliable on Windows.');
8+
console.log('1..0 # Skipped: not reliable on Windows.');
99
process.exit(0);
1010
}
1111

test/parallel/test-cluster-disconnect-unshared-udp.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22
if (process.platform === 'win32') {
3-
console.log('skipping test on windows, where clustered dgram is ENOTSUP');
3+
console.log('1..0 # Skipped: on windows, because clustered dgram is ENOTSUP');
44
process.exit(0);
55
}
66

test/parallel/test-cluster-shared-handle-bind-privileged-port.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ var cluster = require('cluster');
55
var net = require('net');
66

77
if (process.platform === 'win32') {
8-
console.log('Skipping test, not reliable on Windows.');
8+
console.log('1..0 # Skipped: not reliable on Windows');
99
process.exit(0);
1010
}
1111

1212
if (process.getuid() === 0) {
13-
console.log('Do not run this test as root.');
13+
console.log('1..0 # Skipped: as this test should not be run as `root`');
1414
process.exit(0);
1515
}
1616

test/parallel/test-crypto-authenticated.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ for (var i in TEST_CASES) {
5656
var test = TEST_CASES[i];
5757

5858
if (ciphers.indexOf(test.algo) == -1) {
59-
console.log('skipping unsupported ' + test.algo + ' test');
59+
console.log('1..0 # Skipped: unsupported ' + test.algo + ' test');
6060
continue;
6161
}
6262

test/parallel/test-dgram-bind-default-address.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dgram.createSocket('udp4').bind(common.PORT + 0, common.mustCall(function() {
1616
}));
1717

1818
if (!common.hasIPv6) {
19-
console.error('Skipping udp6 part of test, no IPv6 support');
19+
console.log('1..0 # Skipped: udp6 part of test, because no IPv6 support');
2020
return;
2121
}
2222

test/parallel/test-dgram-empty-packet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var client;
99
var timer;
1010

1111
if (process.platform === 'darwin') {
12-
console.error('Test is disabled due to 17894467 Apple bug');
12+
console.log('1..0 # Skipped: because of 17894467 Apple bug');
1313
return;
1414
}
1515

test/parallel/test-dgram-send-empty-buffer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var callbacks = 0;
88
var client, timer, buf;
99

1010
if (process.platform === 'darwin') {
11-
console.error('Test is disabled due to 17894467 Apple bug');
11+
console.log('1..0 # Skipped: because of 17894467 Apple bug');
1212
return;
1313
}
1414

test/parallel/test-fs-readfile-error.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var path = require('path');
77
// `fs.readFile('/')` does not fail on FreeBSD, because you can open and read
88
// the directory there.
99
if (process.platform === 'freebsd') {
10-
console.error('Skipping test, platform not supported.');
10+
console.log('1..0 # Skipped: platform not supported.');
1111
process.exit();
1212
}
1313

test/parallel/test-fs-readfile-pipe-large.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var path = require('path');
66
// simulate `cat readfile.js | node readfile.js`
77

88
if (process.platform === 'win32') {
9-
console.error('No /dev/stdin on windows. Skipping test.');
9+
console.log('1..0 # Skipped: No /dev/stdin on windows.');
1010
process.exit();
1111
}
1212

test/parallel/test-fs-readfile-pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var assert = require('assert');
55
// simulate `cat readfile.js | node readfile.js`
66

77
if (process.platform === 'win32') {
8-
console.error('No /dev/stdin on windows. Skipping test.');
8+
console.log('1..0 # Skipped: No /dev/stdin on windows.');
99
process.exit();
1010
}
1111

test/parallel/test-fs-readfilesync-pipe-large.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var path = require('path');
66
// simulate `cat readfile.js | node readfile.js`
77

88
if (process.platform === 'win32') {
9-
console.error('No /dev/stdin on windows. Skipping test.');
9+
console.log('1..0 # Skipped: No /dev/stdin on windows.');
1010
process.exit();
1111
}
1212

test/parallel/test-fs-realpath.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function test_simple_error_callback(cb) {
8080
function test_simple_relative_symlink(callback) {
8181
console.log('test_simple_relative_symlink');
8282
if (skipSymlinks) {
83-
console.log('skipping symlink test (no privs)');
83+
console.log('1..0 # Skipped: symlink test (no privs)');
8484
return runNextTest();
8585
}
8686
var entry = common.tmpDir + '/symlink',
@@ -143,7 +143,7 @@ function test_simple_absolute_symlink(callback) {
143143
function test_deep_relative_file_symlink(callback) {
144144
console.log('test_deep_relative_file_symlink');
145145
if (skipSymlinks) {
146-
console.log('skipping symlink test (no privs)');
146+
console.log('1..0 # Skipped: symlink test (no privs)');
147147
return runNextTest();
148148
}
149149

@@ -175,7 +175,7 @@ function test_deep_relative_file_symlink(callback) {
175175
function test_deep_relative_dir_symlink(callback) {
176176
console.log('test_deep_relative_dir_symlink');
177177
if (skipSymlinks) {
178-
console.log('skipping symlink test (no privs)');
178+
console.log('1..0 # Skipped: symlink test (no privs)');
179179
return runNextTest();
180180
}
181181
var expected = path.join(common.fixturesDir, 'cycles', 'folder');
@@ -207,7 +207,7 @@ function test_deep_relative_dir_symlink(callback) {
207207
function test_cyclic_link_protection(callback) {
208208
console.log('test_cyclic_link_protection');
209209
if (skipSymlinks) {
210-
console.log('skipping symlink test (no privs)');
210+
console.log('1..0 # Skipped: symlink test (no privs)');
211211
return runNextTest();
212212
}
213213
var entry = common.tmpDir + '/cycles/realpath-3a';
@@ -230,7 +230,7 @@ function test_cyclic_link_protection(callback) {
230230
function test_cyclic_link_overprotection(callback) {
231231
console.log('test_cyclic_link_overprotection');
232232
if (skipSymlinks) {
233-
console.log('skipping symlink test (no privs)');
233+
console.log('1..0 # Skipped: symlink test (no privs)');
234234
return runNextTest();
235235
}
236236
var cycles = common.tmpDir + '/cycles';
@@ -251,7 +251,7 @@ function test_cyclic_link_overprotection(callback) {
251251
function test_relative_input_cwd(callback) {
252252
console.log('test_relative_input_cwd');
253253
if (skipSymlinks) {
254-
console.log('skipping symlink test (no privs)');
254+
console.log('1..0 # Skipped: symlink test (no privs)');
255255
return runNextTest();
256256
}
257257

@@ -295,7 +295,7 @@ function test_deep_symlink_mix(callback) {
295295
if (isWindows) {
296296
// This one is a mix of files and directories, and it's quite tricky
297297
// to get the file/dir links sorted out correctly.
298-
console.log('skipping symlink test (no way to work on windows)');
298+
console.log('1..0 # Skipped: symlink test (no privs)');
299299
return runNextTest();
300300
}
301301

@@ -391,7 +391,7 @@ assert.equal(upone, uponeActual,
391391
function test_up_multiple(cb) {
392392
console.error('test_up_multiple');
393393
if (skipSymlinks) {
394-
console.log('skipping symlink test (no privs)');
394+
console.log('1..0 # Skipped: symlink test (no privs)');
395395
return runNextTest();
396396
}
397397
function cleanup() {

test/parallel/test-http-curl-chunk-problem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var common = require('../common');
33
var assert = require('assert');
44
if (!common.opensslCli) {
5-
console.error('Skipping because node compiled without OpenSSL CLI.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
66
process.exit(0);
77
}
88

test/parallel/test-http-full-response.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function runAb(opts, callback) {
2727
exec(command, function(err, stdout, stderr) {
2828
if (err) {
2929
if (/ab|apr/mi.test(stderr)) {
30-
console.log('problem spawning ab - skipping test.\n' + stderr);
30+
console.log('1..0 # Skipped: problem spawning `ab`.\n' + stderr);
3131
process.reallyExit(0);
3232
}
3333
process.exit();

test/parallel/test-http-localaddress.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var http = require('http'),
44
assert = require('assert');
55

66
if (!common.hasMultiLocalhost()) {
7-
console.log('Skipping platform-specific test.');
7+
console.log('1..0 # Skipped: platform-specific test.');
88
process.exit();
99
}
1010

test/parallel/test-https-foafssl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var common = require('../common');
33

44
if (!common.opensslCli) {
5-
console.error('Skipping because node compiled without OpenSSL CLI.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
66
process.exit(0);
77
}
88

test/parallel/test-https-localaddress.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (!common.hasCrypto) {
1010
var https = require('https');
1111

1212
if (!common.hasMultiLocalhost()) {
13-
console.log('Skipping platform-specific test.');
13+
console.log('1..0 # Skipped: platform-specific test.');
1414
process.exit();
1515
}
1616

test/parallel/test-intl.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (!haveIntl) {
2424
'"Intl" object is NOT present but v8_enable_i18n_support is ' +
2525
enablei18n;
2626
assert.equal(enablei18n, false, erMsg);
27-
console.log('Skipping Intl tests because Intl object not present.');
27+
console.log('1..0 # Skipped: Intl tests because Intl object not present.');
2828

2929
} else {
3030
var erMsg =
@@ -46,8 +46,8 @@ if (!haveIntl) {
4646

4747
// If list is specified and doesn't contain 'en' then return.
4848
if (process.config.variables.icu_locales && !haveLocale('en')) {
49-
console.log('Skipping detailed Intl tests because English is not listed ' +
50-
'as supported.');
49+
console.log('1..0 # Skipped: detailed Intl tests because English is not ' +
50+
'listed as supported.');
5151
// Smoke test. Does it format anything, or fail?
5252
console.log('Date(0) formatted to: ' + dtf.format(date0));
5353
return;

test/parallel/test-listen-fd-cluster.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var cluster = require('cluster');
1010
console.error('Cluster listen fd test', process.argv.slice(2));
1111

1212
if (process.platform === 'win32') {
13-
console.error('This test is disabled on windows.');
13+
console.log('1..0 # Skipped: This test is disabled on windows.');
1414
return;
1515
}
1616

test/parallel/test-listen-fd-detached-inherit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var PORT = common.PORT;
77
var spawn = require('child_process').spawn;
88

99
if (process.platform === 'win32') {
10-
console.error('This test is disabled on windows.');
10+
console.log('1..0 # Skipped: This test is disabled on windows.');
1111
return;
1212
}
1313

test/parallel/test-listen-fd-detached.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var PORT = common.PORT;
77
var spawn = require('child_process').spawn;
88

99
if (process.platform === 'win32') {
10-
console.error('This test is disabled on windows.');
10+
console.log('1..0 # Skipped: This test is disabled on windows.');
1111
return;
1212
}
1313

test/parallel/test-listen-fd-server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var PORT = common.PORT;
77
var spawn = require('child_process').spawn;
88

99
if (process.platform === 'win32') {
10-
console.error('This test is disabled on windows.');
10+
console.log('1..0 # Skipped: This test is disabled on windows.');
1111
return;
1212
}
1313

test/parallel/test-module-loading-error.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var error_desc = {
1313
var dlerror_msg = error_desc[process.platform];
1414

1515
if (!dlerror_msg) {
16-
console.error('Skipping test, platform not supported.');
16+
console.log('1..0 # Skipped: platform not supported.');
1717
process.exit();
1818
}
1919

test/parallel/test-net-connect-options-ipv6.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var net = require('net');
55
var dns = require('dns');
66

77
if (!common.hasIPv6) {
8-
console.error('Skipping test, no IPv6 support');
8+
console.log('1..0 # Skipped: no IPv6 support');
99
return;
1010
}
1111

test/parallel/test-process-getgroups.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var assert = require('assert');
44
var exec = require('child_process').exec;
55

66
if (process.platform === 'darwin') {
7-
console.log('Skipping. Output of `id -G` is unreliable on Darwin.');
7+
console.log('1..0 # Skipped: Output of `id -G` is unreliable on Darwin.');
88
return;
99
}
1010

test/parallel/test-stdio-closed.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var assert = require('assert');
44
var spawn = require('child_process').spawn;
55

66
if (process.platform === 'win32') {
7-
console.log('Skipping test, platform not supported.');
7+
console.log('1..0 # Skipped: platform not supported.');
88
return;
99
}
1010

test/parallel/test-tls-alert-handling.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var common = require('../common');
33
var assert = require('assert');
44

55
if (!common.opensslCli) {
6-
console.error('Skipping because node compiled without OpenSSL CLI.');
6+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
77
process.exit(0);
88
}
99

test/parallel/test-tls-alert.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var common = require('../common');
33
var assert = require('assert');
44

55
if (!common.opensslCli) {
6-
console.error('Skipping because node compiled without OpenSSL CLI.');
6+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
77
process.exit(0);
88
}
99

test/parallel/test-tls-no-sslv3.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var fs = require('fs');
1212
var spawn = require('child_process').spawn;
1313

1414
if (common.opensslCli === false) {
15-
console.error('Skipping because openssl command cannot be executed');
15+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
1616
process.exit(0);
1717
}
1818

test/parallel/test-tls-npn-server-client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
if (!process.features.tls_npn) {
3-
console.error('Skipping because node compiled without OpenSSL or ' +
4-
'with old OpenSSL version.');
3+
console.log('1..0 # Skipped: node compiled without OpenSSL or ' +
4+
'with old OpenSSL version.');
55
process.exit(0);
66
}
77

test/parallel/test-tls-ocsp-callback.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
var common = require('../common');
33

44
if (!process.features.tls_ocsp) {
5-
console.error('Skipping because node compiled without OpenSSL or ' +
6-
'with old OpenSSL version.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL or ' +
6+
'with old OpenSSL version.');
77
process.exit(0);
88
}
99
if (!common.opensslCli) {
10-
console.error('Skipping because node compiled without OpenSSL CLI.');
10+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
1111
process.exit(0);
1212
}
1313

test/parallel/test-tls-server-verify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var common = require('../common');
33

44
if (!common.opensslCli) {
5-
console.error('Skipping because node compiled without OpenSSL CLI.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
66
process.exit(0);
77
}
88

test/parallel/test-tls-session-cache.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var common = require('../common');
33

44
if (!common.opensslCli) {
5-
console.error('Skipping because node compiled without OpenSSL CLI.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
66
process.exit(0);
77
}
88

test/parallel/test-tls-set-ciphers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var common = require('../common');
33

44
if (!common.opensslCli) {
5-
console.error('Skipping because node compiled without OpenSSL CLI.');
5+
console.log('1..0 # Skipped: node compiled without OpenSSL CLI.');
66
process.exit(0);
77
}
88

0 commit comments

Comments
 (0)