Skip to content

Commit

Permalink
test: replace deprecated util.debug() calls
Browse files Browse the repository at this point in the history
common.debug() is just util.debug() and emits a deprecation notice. Per
docs, use console.error() instead.

PR-URL: #3082
Reviewed-By: Michaël Zasso <[email protected]>
  • Loading branch information
Trott authored and rvagg committed Sep 30, 2015
1 parent 6ee5d0f commit 5ada45b
Show file tree
Hide file tree
Showing 24 changed files with 61 additions and 62 deletions.
2 changes: 1 addition & 1 deletion test/disabled/test-sendfd.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var logChild = function(d) {

d.split('\n').forEach(function(l) {
if (l.length > 0) {
common.debug('CHILD: ' + l);
console.error('CHILD: ' + l);
}
});
};
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-file-read-noexist.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ fs.readFile(filename, 'raw', function(err, content) {
if (err) {
got_error = true;
} else {
common.debug('cat returned some content: ' + content);
common.debug('this shouldn\'t happen as the file doesn\'t exist...');
console.error('cat returned some content: ' + content);
console.error('this shouldn\'t happen as the file doesn\'t exist...');
assert.equal(true, false);
}
});
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-fs-realpath.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ function test_deep_symlink_mix(callback) {
[fixturesAbsDir + '/nested-index/two/realpath-c',
'../../../' + common.tmpDirName + '/cycles/root.js']
].forEach(function(t) {
//common.debug('setting up '+t[0]+' -> '+t[1]);
try { fs.unlinkSync(t[0]); } catch (e) {}
fs.symlinkSync(t[1], t[0]);
unlink.push(t[0]);
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http-after-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var serverRequests = 0;
var clientResponses = 0;

var server = http.createServer(function(req, res) {
common.debug('Server got GET request');
console.error('Server got GET request');
req.resume();
++serverRequests;
res.writeHead(200);
Expand All @@ -18,7 +18,7 @@ var server = http.createServer(function(req, res) {
}, 50);
});
server.on('connect', function(req, socket, firstBodyChunk) {
common.debug('Server got CONNECT request');
console.error('Server got CONNECT request');
serverConnected = true;
socket.write('HTTP/1.1 200 Connection established\r\n\r\n');
socket.resume();
Expand All @@ -33,7 +33,7 @@ server.listen(common.PORT, function() {
path: 'google.com:80'
});
req.on('connect', function(res, socket, firstBodyChunk) {
common.debug('Client got CONNECT response');
console.error('Client got CONNECT response');
socket.end();
socket.on('end', function() {
doRequest(0);
Expand All @@ -49,7 +49,7 @@ function doRequest(i) {
port: common.PORT,
path: '/request' + i
}, function(res) {
common.debug('Client got GET response');
console.error('Client got GET response');
var data = '';
res.setEncoding('utf8');
res.on('data', function(chunk) {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var server = http.createServer(function(req, res) {
server.on('connect', function(req, socket, firstBodyChunk) {
assert.equal(req.method, 'CONNECT');
assert.equal(req.url, 'google.com:443');
common.debug('Server got CONNECT request');
console.error('Server got CONNECT request');
serverGotConnect = true;

socket.write('HTTP/1.1 200 Connection established\r\n\r\n');
Expand Down Expand Up @@ -40,7 +40,7 @@ server.listen(common.PORT, function() {
});

req.on('connect', function(res, socket, firstBodyChunk) {
common.debug('Client got CONNECT request');
console.error('Client got CONNECT request');
clientGotConnect = true;

// Make sure this request got removed from the pool.
Expand Down
10 changes: 5 additions & 5 deletions test/parallel/test-http-expect-continue.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var got_continue = false;

function handler(req, res) {
assert.equal(sent_continue, true, 'Full response sent before 100 Continue');
common.debug('Server sending full response...');
console.error('Server sending full response...');
res.writeHead(200, {
'Content-Type' : 'text/plain',
'ABCD' : '1'
Expand All @@ -21,7 +21,7 @@ function handler(req, res) {

var server = http.createServer(handler);
server.on('checkContinue', function(req, res) {
common.debug('Server got Expect: 100-continue...');
console.error('Server got Expect: 100-continue...');
res.writeContinue();
sent_continue = true;
setTimeout(function() {
Expand All @@ -38,11 +38,11 @@ server.on('listening', function() {
path: '/world',
headers: { 'Expect': '100-continue' }
});
common.debug('Client sending request...');
console.error('Client sending request...');
outstanding_reqs++;
var body = '';
req.on('continue', function() {
common.debug('Client got 100 Continue...');
console.error('Client got 100 Continue...');
got_continue = true;
req.end(test_req_body);
});
Expand All @@ -54,7 +54,7 @@ server.on('listening', function() {
res.setEncoding('utf8');
res.on('data', function(chunk) { body += chunk; });
res.on('end', function() {
common.debug('Got full response.');
console.error('Got full response.');
assert.equal(body, test_res_body, 'Response body doesn\'t match.');
assert.ok('abcd' in res.headers, 'Response headers missing.');
outstanding_reqs--;
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http-legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ server.listen(common.PORT, function() {
responses_recvd += 1;
res.setEncoding('utf8');
res.on('data', function(chunk) { body0 += chunk; });
common.debug('Got /hello response');
console.error('Got /hello response');
});

setTimeout(function() {
Expand All @@ -65,16 +65,16 @@ server.listen(common.PORT, function() {
responses_recvd += 1;
res.setEncoding('utf8');
res.on('data', function(chunk) { body1 += chunk; });
common.debug('Got /world response');
console.error('Got /world response');
});
}, 1);
});

process.on('exit', function() {
common.debug('responses_recvd: ' + responses_recvd);
console.error('responses_recvd: ' + responses_recvd);
assert.equal(2, responses_recvd);

common.debug('responses_sent: ' + responses_sent);
console.error('responses_sent: ' + responses_sent);
assert.equal(2, responses_sent);

assert.equal('The path was /hello', body0);
Expand Down
12 changes: 6 additions & 6 deletions test/parallel/test-http-pause.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ var expectedClient = 'Response Body from Server';
var resultClient = '';

var server = http.createServer(function(req, res) {
common.debug('pause server request');
console.error('pause server request');
req.pause();
setTimeout(function() {
common.debug('resume server request');
console.error('resume server request');
req.resume();
req.setEncoding('utf8');
req.on('data', function(chunk) {
resultServer += chunk;
});
req.on('end', function() {
common.debug(resultServer);
console.error(resultServer);
res.writeHead(200);
res.end(expectedClient);
});
Expand All @@ -32,16 +32,16 @@ server.listen(common.PORT, function() {
path: '/',
method: 'POST'
}, function(res) {
common.debug('pause client response');
console.error('pause client response');
res.pause();
setTimeout(function() {
common.debug('resume client response');
console.error('resume client response');
res.resume();
res.on('data', function(chunk) {
resultClient += chunk;
});
res.on('end', function() {
common.debug(resultClient);
console.error(resultClient);
server.close();
});
}, 100);
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-http-pipe-fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ var server = http.createServer(function(req, res) {
}
}, function(res) {
res.on('end', function() {
common.debug('res' + i + ' end');
console.error('res' + i + ' end');
if (i === 2) {
server.close();
}
});
res.resume();
});
req.on('socket', function(s) {
common.debug('req' + i + ' start');
console.error('req' + i + ' start');
});
req.end('12345');
}(i + 1));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-set-timeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var server = http.createServer(function(req, res) {
assert.ok(s instanceof net.Socket);
req.connection.on('timeout', function() {
req.connection.destroy();
common.debug('TIMEOUT');
console.error('TIMEOUT');
server.close();
});
});
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-http.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ server.on('listening', function() {
responses_recvd += 1;
res.setEncoding('utf8');
res.on('data', function(chunk) { body0 += chunk; });
common.debug('Got /hello response');
console.error('Got /hello response');
});

setTimeout(function() {
Expand All @@ -70,17 +70,17 @@ server.on('listening', function() {
responses_recvd += 1;
res.setEncoding('utf8');
res.on('data', function(chunk) { body1 += chunk; });
common.debug('Got /world response');
console.error('Got /world response');
});
req.end();
}, 1);
});

process.on('exit', function() {
common.debug('responses_recvd: ' + responses_recvd);
console.error('responses_recvd: ' + responses_recvd);
assert.equal(2, responses_recvd);

common.debug('responses_sent: ' + responses_sent);
console.error('responses_sent: ' + responses_sent);
assert.equal(2, responses_sent);

assert.equal('The path was /hello', body0);
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-https-drain.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ server.listen(common.PORT, function() {
}, function(res) {
var timer;
res.pause();
common.debug('paused');
console.error('paused');
send();
function send() {
if (req.write(new Buffer(bufSize))) {
Expand All @@ -43,10 +43,10 @@ server.listen(common.PORT, function() {
return process.nextTick(send);
}
sent += bufSize;
common.debug('sent: ' + sent);
console.error('sent: ' + sent);
resumed = true;
res.resume();
common.debug('resumed');
console.error('resumed');
timer = setTimeout(function() {
process.exit(1);
}, 1000);
Expand All @@ -60,7 +60,7 @@ server.listen(common.PORT, function() {
}
received += data.length;
if (received >= sent) {
common.debug('received: ' + received);
console.error('received: ' + received);
req.end();
server.close();
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-module-loading-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var common = require('../common');
var assert = require('assert');

common.debug('load test-module-loading-error.js');
console.error('load test-module-loading-error.js');

var error_desc = {
win32: '%1 is not a valid Win32 application',
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-net-listen-close-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ server.listen(common.PORT, function() {
assert(false);
});
server.on('error', function(error) {
common.debug(error);
console.error(error);
assert(false);
});
server.close();
2 changes: 1 addition & 1 deletion test/parallel/test-net-listen-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ server.listen(1, '1.1.1.1', function() { // EACCESS or EADDRNOTAVAIL
assert(false);
});
server.on('error', function(error) {
common.debug(error);
console.error(error);
gotError = true;
});

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-client-reject.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var connectCount = 0;
var server = tls.createServer(options, function(socket) {
++connectCount;
socket.on('data', function(data) {
common.debug(data.toString());
console.error(data.toString());
assert.equal(data, 'ok');
});
}).listen(common.PORT, function() {
Expand Down Expand Up @@ -51,7 +51,7 @@ function rejectUnauthorized() {
assert(false);
});
socket.on('error', function(err) {
common.debug(err);
console.error(err);
authorized();
});
socket.write('ng');
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-tls-pause.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ server.listen(common.PORT, function() {
}, function() {
console.error('connected');
client.pause();
common.debug('paused');
console.error('paused');
send();
function send() {
console.error('sending');
Expand All @@ -48,7 +48,7 @@ server.listen(common.PORT, function() {
return process.nextTick(send);
}
sent += bufSize;
common.debug('sent: ' + sent);
console.error('sent: ' + sent);
resumed = true;
client.resume();
console.error('resumed', client);
Expand All @@ -61,7 +61,7 @@ server.listen(common.PORT, function() {
console.error('received', received);
console.error('sent', sent);
if (received >= sent) {
common.debug('received: ' + received);
console.error('received: ' + received);
client.end();
server.close();
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-peer-certificate-encoding.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ server.listen(common.PORT, function() {
}, function() {
var peerCert = socket.getPeerCertificate();

common.debug(util.inspect(peerCert));
console.error(util.inspect(peerCert));
assert.equal(peerCert.subject.CN, 'Ádám Lippai');
verified = true;
server.close();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-peer-certificate-multi-keys.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ server.listen(common.PORT, function() {
rejectUnauthorized: false
}, function() {
var peerCert = socket.getPeerCertificate();
common.debug(util.inspect(peerCert));
console.error(util.inspect(peerCert));
assert.deepEqual(peerCert.subject.OU,
['Information Technology', 'Engineering', 'Marketing']);
verified = true;
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-peer-certificate.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ server.listen(common.PORT, function() {
peerCert = socket.getPeerCertificate(true);
assert.ok(peerCert.issuerCertificate);

common.debug(util.inspect(peerCert));
console.error(util.inspect(peerCert));
assert.equal(peerCert.subject.emailAddress, '[email protected]');
assert.equal(peerCert.serialNumber, '9A84ABCFB8A72AC0');
assert.equal(peerCert.exponent, '0x10001');
Expand Down
2 changes: 1 addition & 1 deletion test/pummel/test-net-pause.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ server.listen(common.PORT);

process.on('exit', function() {
assert.equal(N, recv.length);
common.debug('Exit');
console.error('Exit');
});
Loading

0 comments on commit 5ada45b

Please sign in to comment.