Skip to content

Commit e922716

Browse files
Trottjasnell
Trott
authored and
jasnell
committedOct 8, 2015
test: remove deprecated error logging
common.error() is just deprecated util.error() renamed. Remove calls to it and some other extraneous console logging in tests. PR-URL: #3079 Reviewed-By: Ben Noordhuis <[email protected]>
·
v4.9.1v4.2.0
1 parent 8f29d95 commit e922716

19 files changed

+2
-135
lines changed
 

‎test/parallel/test-fs-append-file-sync.js

-8
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,16 @@ common.refreshTmpDir();
2020
// test that empty file will be created and have content added
2121
var filename = join(common.tmpDir, 'append-sync.txt');
2222

23-
common.error('appending to ' + filename);
2423
fs.appendFileSync(filename, data);
2524

2625
var fileData = fs.readFileSync(filename);
27-
console.error('filedata is a ' + typeof fileData);
2826

2927
assert.equal(Buffer.byteLength(data), fileData.length);
3028

3129
// test that appends data to a non empty file
3230
var filename2 = join(common.tmpDir, 'append-sync2.txt');
3331
fs.writeFileSync(filename2, currentFileData);
3432

35-
common.error('appending to ' + filename2);
3633
fs.appendFileSync(filename2, data);
3734

3835
var fileData2 = fs.readFileSync(filename2);
@@ -44,8 +41,6 @@ assert.equal(Buffer.byteLength(data) + currentFileData.length,
4441
var filename3 = join(common.tmpDir, 'append-sync3.txt');
4542
fs.writeFileSync(filename3, currentFileData);
4643

47-
common.error('appending to ' + filename3);
48-
4944
var buf = new Buffer(data, 'utf8');
5045
fs.appendFileSync(filename3, buf);
5146

@@ -57,7 +52,6 @@ assert.equal(buf.length + currentFileData.length, fileData3.length);
5752
var filename4 = join(common.tmpDir, 'append-sync4.txt');
5853
fs.writeFileSync(filename4, currentFileData, { mode: m });
5954

60-
common.error('appending to ' + filename4);
6155
var m = 0o600;
6256
fs.appendFileSync(filename4, num, { mode: m });
6357

@@ -75,8 +69,6 @@ assert.equal(Buffer.byteLength('' + num) + currentFileData.length,
7569
//exit logic for cleanup
7670

7771
process.on('exit', function() {
78-
common.error('done');
79-
8072
fs.unlinkSync(filename);
8173
fs.unlinkSync(filename2);
8274
fs.unlinkSync(filename3);

‎test/parallel/test-fs-append-file.js

-14
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ var join = require('path').join;
66

77
var filename = join(common.tmpDir, 'append.txt');
88

9-
common.error('appending to ' + filename);
10-
119
var currentFileData = 'ABCD';
1210

1311
var n = 220;
@@ -28,11 +26,9 @@ fs.appendFile(filename, s, function(e) {
2826
if (e) throw e;
2927

3028
ncallbacks++;
31-
common.error('appended to file');
3229

3330
fs.readFile(filename, function(e, buffer) {
3431
if (e) throw e;
35-
common.error('file read');
3632
ncallbacks++;
3733
assert.equal(Buffer.byteLength(s), buffer.length);
3834
});
@@ -46,11 +42,9 @@ fs.appendFile(filename2, s, function(e) {
4642
if (e) throw e;
4743

4844
ncallbacks++;
49-
common.error('appended to file2');
5045

5146
fs.readFile(filename2, function(e, buffer) {
5247
if (e) throw e;
53-
common.error('file2 read');
5448
ncallbacks++;
5549
assert.equal(Buffer.byteLength(s) + currentFileData.length, buffer.length);
5650
});
@@ -61,17 +55,14 @@ var filename3 = join(common.tmpDir, 'append3.txt');
6155
fs.writeFileSync(filename3, currentFileData);
6256

6357
var buf = new Buffer(s, 'utf8');
64-
common.error('appending to ' + filename3);
6558

6659
fs.appendFile(filename3, buf, function(e) {
6760
if (e) throw e;
6861

6962
ncallbacks++;
70-
common.error('appended to file3');
7163

7264
fs.readFile(filename3, function(e, buffer) {
7365
if (e) throw e;
74-
common.error('file3 read');
7566
ncallbacks++;
7667
assert.equal(buf.length + currentFileData.length, buffer.length);
7768
});
@@ -81,14 +72,11 @@ fs.appendFile(filename3, buf, function(e) {
8172
var filename4 = join(common.tmpDir, 'append4.txt');
8273
fs.writeFileSync(filename4, currentFileData);
8374

84-
common.error('appending to ' + filename4);
85-
8675
var m = 0o600;
8776
fs.appendFile(filename4, n, { mode: m }, function(e) {
8877
if (e) throw e;
8978

9079
ncallbacks++;
91-
common.error('appended to file4');
9280

9381
// windows permissions aren't unix
9482
if (!common.isWindows) {
@@ -98,15 +86,13 @@ fs.appendFile(filename4, n, { mode: m }, function(e) {
9886

9987
fs.readFile(filename4, function(e, buffer) {
10088
if (e) throw e;
101-
common.error('file4 read');
10289
ncallbacks++;
10390
assert.equal(Buffer.byteLength('' + n) + currentFileData.length,
10491
buffer.length);
10592
});
10693
});
10794

10895
process.on('exit', function() {
109-
common.error('done');
11096
assert.equal(8, ncallbacks);
11197

11298
fs.unlinkSync(filename);

‎test/parallel/test-fs-fsync.js

-7
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,20 @@ var successes = 0;
88

99
var file = path.join(common.fixturesDir, 'a.js');
1010

11-
common.error('open ' + file);
12-
1311
fs.open(file, 'a', 0o777, function(err, fd) {
14-
common.error('fd ' + fd);
1512
if (err) throw err;
1613

1714
fs.fdatasyncSync(fd);
18-
common.error('fdatasync SYNC: ok');
1915
successes++;
2016

2117
fs.fsyncSync(fd);
22-
common.error('fsync SYNC: ok');
2318
successes++;
2419

2520
fs.fdatasync(fd, function(err) {
2621
if (err) throw err;
27-
common.error('fdatasync ASYNC: ok');
2822
successes++;
2923
fs.fsync(fd, function(err) {
3024
if (err) throw err;
31-
common.error('fsync ASYNC: ok');
3225
successes++;
3326
});
3427
});

‎test/parallel/test-fs-write-file.js

-11
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ common.refreshTmpDir();
88

99
var filename = join(common.tmpDir, 'test.txt');
1010

11-
common.error('writing to ' + filename);
12-
1311
var n = 220;
1412
var s = '南越国是前203年至前111年存在于岭南地区的一个国家，国都位于番禺，疆域包括今天中国的广东、' +
1513
'广西两省区的大部份地区，福建省、湖南、贵州、云南的一小部份地区和越南的北部。' +
@@ -25,11 +23,9 @@ fs.writeFile(filename, s, function(e) {
2523
if (e) throw e;
2624

2725
ncallbacks++;
28-
common.error('file written');
2926

3027
fs.readFile(filename, function(e, buffer) {
3128
if (e) throw e;
32-
common.error('file read');
3329
ncallbacks++;
3430
assert.equal(Buffer.byteLength(s), buffer.length);
3531
});
@@ -38,25 +34,21 @@ fs.writeFile(filename, s, function(e) {
3834
// test that writeFile accepts buffers
3935
var filename2 = join(common.tmpDir, 'test2.txt');
4036
var buf = new Buffer(s, 'utf8');
41-
common.error('writing to ' + filename2);
4237

4338
fs.writeFile(filename2, buf, function(e) {
4439
if (e) throw e;
4540

4641
ncallbacks++;
47-
common.error('file2 written');
4842

4943
fs.readFile(filename2, function(e, buffer) {
5044
if (e) throw e;
51-
common.error('file2 read');
5245
ncallbacks++;
5346
assert.equal(buf.length, buffer.length);
5447
});
5548
});
5649

5750
// test that writeFile accepts numbers.
5851
var filename3 = join(common.tmpDir, 'test3.txt');
59-
common.error('writing to ' + filename3);
6052

6153
var m = 0o600;
6254
fs.writeFile(filename3, n, { mode: m }, function(e) {
@@ -69,19 +61,16 @@ fs.writeFile(filename3, n, { mode: m }, function(e) {
6961
}
7062

7163
ncallbacks++;
72-
common.error('file3 written');
7364

7465
fs.readFile(filename3, function(e, buffer) {
7566
if (e) throw e;
76-
common.error('file3 read');
7767
ncallbacks++;
7868
assert.equal(Buffer.byteLength('' + n), buffer.length);
7969
});
8070
});
8171

8272

8373
process.on('exit', function() {
84-
common.error('done');
8574
assert.equal(6, ncallbacks);
8675

8776
fs.unlinkSync(filename);

‎test/parallel/test-http-304.js

-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ s.listen(common.PORT, function() {
1515
function(err, stdout, stderr) {
1616
if (err) throw err;
1717
s.close();
18-
common.error('curled response correctly');
19-
common.error(common.inspect(stdout));
2018
});
2119
});
22-
23-
console.log('Server running at http://127.0.0.1:' + common.PORT + '/');

‎test/parallel/test-http-blank-header.js

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var net = require('net');
77
var gotReq = false;
88

99
var server = http.createServer(function(req, res) {
10-
common.error('got req');
1110
gotReq = true;
1211
assert.equal('GET', req.method);
1312
assert.equal('/blah', req.url);
@@ -23,7 +22,6 @@ server.listen(common.PORT, function() {
2322
var c = net.createConnection(common.PORT);
2423

2524
c.on('connect', function() {
26-
common.error('client wrote message');
2725
c.write('GET /blah HTTP/1.1\r\n' +
2826
'Host: mapdevel.trolologames.ru:443\r\n' +
2927
'Cookie:\r\n' +
@@ -37,7 +35,6 @@ server.listen(common.PORT, function() {
3735
});
3836

3937
c.on('close', function() {
40-
common.error('client close');
4138
server.close();
4239
});
4340
});

‎test/parallel/test-http-client-upload-buf.js

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ server.on('listening', function() {
4343

4444
req.write(new Buffer(N));
4545
req.end();
46-
47-
common.error('client finished sending request');
4846
});
4947

5048
process.on('exit', function() {

‎test/parallel/test-http-client-upload.js

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ server.on('listening', function() {
4646
req.write('2\n');
4747
req.write('3\n');
4848
req.end();
49-
50-
common.error('client finished sending request');
5149
});
5250

5351
process.on('exit', function() {

‎test/parallel/test-http-head-response-has-no-body-end.js

-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@ server.on('listening', function() {
2222
method: 'HEAD',
2323
path: '/'
2424
}, function(res) {
25-
common.error('response');
2625
res.on('end', function() {
27-
common.error('response end');
2826
server.close();
2927
responseComplete = true;
3028
});
3129
res.resume();
3230
});
33-
common.error('req');
3431
req.end();
3532
});
3633

‎test/parallel/test-http-head-response-has-no-body.js

-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@ server.on('listening', function() {
2222
method: 'HEAD',
2323
path: '/'
2424
}, function(res) {
25-
common.error('response');
2625
res.on('end', function() {
27-
common.error('response end');
2826
server.close();
2927
responseComplete = true;
3028
});
3129
res.resume();
3230
});
33-
common.error('req');
3431
req.end();
3532
});
3633

‎test/parallel/test-http-legacy.js

-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ var assert = require('assert');
44
var http = require('http');
55
var url = require('url');
66

7-
function p(x) {
8-
common.error(common.inspect(x));
9-
}
10-
117
var responses_sent = 0;
128
var responses_recvd = 0;
139
var body0 = '';
@@ -39,8 +35,6 @@ var server = http.createServer(function(req, res) {
3935
responses_sent += 1;
4036
});
4137
req.resume();
42-
43-
//assert.equal('127.0.0.1', res.connection.remoteAddress);
4438
});
4539

4640
server.listen(common.PORT, function() {

‎test/parallel/test-http-server.js

-4
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,17 @@ var server = http.createServer(function(req, res) {
2323
}
2424

2525
if (req.id == 1) {
26-
common.error('req 1');
2726
assert.equal('POST', req.method);
2827
assert.equal('/quit', url.parse(req.url).pathname);
2928
}
3029

3130
if (req.id == 2) {
32-
common.error('req 2');
3331
assert.equal('foo', req.headers['x-x']);
3432
}
3533

3634
if (req.id == 3) {
37-
common.error('req 3');
3835
assert.equal('bar', req.headers['x-x']);
3936
this.close();
40-
common.error('server closed');
4137
}
4238

4339
setTimeout(function() {

‎test/parallel/test-http-upgrade-server2.js

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

77
var server = http.createServer(function(req, res) {
8-
common.error('got req');
98
throw new Error('This shouldn\'t happen.');
109
});
1110

1211
server.on('upgrade', function(req, socket, upgradeHead) {
13-
common.error('got upgrade event');
1412
// test that throwing an error from upgrade gets
1513
// is uncaught
1614
throw new Error('upgrade error');
@@ -19,7 +17,6 @@ server.on('upgrade', function(req, socket, upgradeHead) {
1917
var gotError = false;
2018

2119
process.on('uncaughtException', function(e) {
22-
common.error('got \'clientError\' event');
2320
assert.equal('upgrade error', e.message);
2421
gotError = true;
2522
process.exit(0);
@@ -30,7 +27,6 @@ server.listen(common.PORT, function() {
3027
var c = net.createConnection(common.PORT);
3128

3229
c.on('connect', function() {
33-
common.error('client wrote message');
3430
c.write('GET /blah HTTP/1.1\r\n' +
3531
'Upgrade: WebSocket\r\n' +
3632
'Connection: Upgrade\r\n' +
@@ -42,7 +38,6 @@ server.listen(common.PORT, function() {
4238
});
4339

4440
c.on('close', function() {
45-
common.error('client close');
4641
server.close();
4742
});
4843
});

‎test/parallel/test-http-write-empty-string.js

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ server.listen(common.PORT, function() {
3131
res.on('data', function(chunk) {
3232
response += chunk;
3333
});
34-
common.error('Got /hello response');
3534
});
3635
});
3736

‎test/parallel/test-http.js

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ var assert = require('assert');
44
var http = require('http');
55
var url = require('url');
66

7-
function p(x) {
8-
common.error(common.inspect(x));
9-
}
10-
117
var responses_sent = 0;
128
var responses_recvd = 0;
139
var body0 = '';

‎test/parallel/test-net-binary.js

-25
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,18 @@ var binaryString = '';
77
for (var i = 255; i >= 0; i--) {
88
var s = '\'\\' + i.toString(8) + '\'';
99
var S = eval(s);
10-
common.error(s +
11-
' ' +
12-
JSON.stringify(S) +
13-
' ' +
14-
JSON.stringify(String.fromCharCode(i)) +
15-
' ' +
16-
S.charCodeAt(0));
1710
assert.ok(S.charCodeAt(0) == i);
1811
assert.ok(S == String.fromCharCode(i));
1912
binaryString += S;
2013
}
2114

2215
// safe constructor
2316
var echoServer = net.Server(function(connection) {
24-
console.error('SERVER got connection');
2517
connection.setEncoding('binary');
2618
connection.on('data', function(chunk) {
27-
common.error('SERVER recved: ' + JSON.stringify(chunk));
2819
connection.write(chunk, 'binary');
2920
});
3021
connection.on('end', function() {
31-
console.error('SERVER ending');
3222
connection.end();
3323
});
3424
});
@@ -37,56 +27,41 @@ echoServer.listen(common.PORT);
3727
var recv = '';
3828

3929
echoServer.on('listening', function() {
40-
console.error('SERVER listening');
4130
var j = 0;
4231
var c = net.createConnection({
4332
port: common.PORT
4433
});
4534

4635
c.setEncoding('binary');
4736
c.on('data', function(chunk) {
48-
console.error('CLIENT data %j', chunk);
4937
var n = j + chunk.length;
5038
while (j < n && j < 256) {
51-
common.error('CLIENT write ' + j);
5239
c.write(String.fromCharCode(j), 'binary');
5340
j++;
5441
}
5542
if (j === 256) {
56-
console.error('CLIENT ending');
5743
c.end();
5844
}
5945
recv += chunk;
6046
});
6147

6248
c.on('connect', function() {
63-
console.error('CLIENT connected, writing');
6449
c.write(binaryString, 'binary');
6550
});
6651

6752
c.on('close', function() {
68-
console.error('CLIENT closed');
69-
console.dir(recv);
7053
echoServer.close();
7154
});
72-
73-
c.on('finish', function() {
74-
console.error('CLIENT finished');
75-
});
7655
});
7756

7857
process.on('exit', function() {
79-
console.log('recv: ' + JSON.stringify(recv));
80-
8158
assert.equal(2 * 256, recv.length);
8259

8360
var a = recv.split('');
8461

8562
var first = a.slice(0, 256).reverse().join('');
86-
console.log('first: ' + JSON.stringify(first));
8763

8864
var second = a.slice(256, 2 * 256).join('');
89-
console.log('second: ' + JSON.stringify(second));
9065

9166
assert.equal(first, second);
9267
});

‎test/parallel/test-pipe-file-to-http.js

-19
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,22 @@ var clientReqComplete = false;
1313
var count = 0;
1414

1515
var server = http.createServer(function(req, res) {
16-
console.error('SERVER request');
1716
var timeoutId;
1817
assert.equal('POST', req.method);
1918
req.pause();
20-
common.error('request paused');
2119

2220
setTimeout(function() {
2321
req.resume();
24-
common.error('request resumed');
2522
}, 1000);
2623

2724
req.on('data', function(chunk) {
28-
common.error('recv data! nchars = ' + chunk.length);
2925
count += chunk.length;
3026
});
3127

3228
req.on('end', function() {
3329
if (timeoutId) {
3430
clearTimeout(timeoutId);
3531
}
36-
console.log('request complete from server');
3732
res.writeHead(200, {'Content-Type': 'text/plain'});
3833
res.end();
3934
});
@@ -42,12 +37,9 @@ server.listen(common.PORT);
4237

4338
server.on('listening', function() {
4439
var cmd = common.ddCommand(filename, 10240);
45-
console.log('dd command: ', cmd);
4640

4741
cp.exec(cmd, function(err, stdout, stderr) {
4842
if (err) throw err;
49-
console.error('EXEC returned successfully stdout=%d stderr=%d',
50-
stdout.length, stderr.length);
5143
makeRequest();
5244
});
5345
});
@@ -59,27 +51,16 @@ function makeRequest() {
5951
method: 'POST'
6052
});
6153

62-
common.error('pipe!');
63-
6454
var s = fs.ReadStream(filename);
6555
s.pipe(req);
66-
s.on('data', function(chunk) {
67-
console.error('FS data chunk=%d', chunk.length);
68-
});
69-
s.on('end', function() {
70-
console.error('FS end');
71-
});
7256
s.on('close', function(err) {
7357
if (err) throw err;
7458
clientReqComplete = true;
75-
common.error('client finished sending request');
7659
});
7760

7861
req.on('response', function(res) {
79-
console.error('RESPONSE', res.statusCode, res.headers);
8062
res.resume();
8163
res.on('end', function() {
82-
console.error('RESPONSE end');
8364
server.close();
8465
});
8566
});

‎test/sequential/test-pump-file2tcp-noexist.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ var got_error = false;
1111
var conn_closed = false;
1212

1313
var server = net.createServer(function(stream) {
14-
common.error('pump!');
1514
util.pump(fs.createReadStream(fn), stream, function(err) {
16-
common.error('util.pump\'s callback fired');
1715
if (err) {
1816
got_error = true;
1917
} else {
20-
console.error('util.pump\'s callback fired with no error');
21-
console.error('this shouldn\'t happen as the file doesn\'t exist...');
18+
// util.pump's callback fired with no error
19+
// this shouldn't happen as the file doesn't exist...
2220
assert.equal(true, false);
2321
}
2422
server.close();
@@ -29,7 +27,6 @@ server.listen(common.PORT, function() {
2927
var conn = net.createConnection(common.PORT);
3028
conn.setEncoding('utf8');
3129
conn.on('data', function(chunk) {
32-
common.error('recv data! nchars = ' + chunk.length);
3330
buffer += chunk;
3431
});
3532

@@ -38,7 +35,6 @@ server.listen(common.PORT, function() {
3835
});
3936

4037
conn.on('close', function() {
41-
common.error('client connection close');
4238
conn_closed = true;
4339
});
4440
});
@@ -48,5 +44,4 @@ var buffer = '';
4844
process.on('exit', function() {
4945
assert.equal(true, got_error);
5046
assert.equal(true, conn_closed);
51-
console.log('exiting');
5247
});

‎test/sequential/test-pump-file2tcp.js

-7
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ var fn = path.join(common.fixturesDir, 'elipses.txt');
1010
var expected = fs.readFileSync(fn, 'utf8');
1111

1212
var server = net.createServer(function(stream) {
13-
common.error('pump!');
1413
util.pump(fs.createReadStream(fn), stream, function() {
15-
common.error('server stream close');
16-
common.error('server close');
1714
server.close();
1815
});
1916
});
@@ -22,16 +19,12 @@ server.listen(common.PORT, function() {
2219
var conn = net.createConnection(common.PORT);
2320
conn.setEncoding('utf8');
2421
conn.on('data', function(chunk) {
25-
common.error('recv data! nchars = ' + chunk.length);
2622
buffer += chunk;
2723
});
2824

2925
conn.on('end', function() {
3026
conn.end();
3127
});
32-
conn.on('close', function() {
33-
common.error('client connection close');
34-
});
3528
});
3629

3730
var buffer = '';

0 commit comments

Comments
 (0)
Please sign in to comment.