Browse Source

lib,test: fix whitespace issues

PR-URL: https://github.com/nodejs/io.js/pull/1971
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v2.3.1-release
Roman Reiss 10 years ago
parent
commit
fb8811d95e
  1. 4
      lib/_debugger.js
  2. 1
      lib/_http_server.js
  3. 3
      lib/_stream_readable.js
  4. 3
      lib/crypto.js
  5. 4
      lib/fs.js
  6. 1
      lib/net.js
  7. 1
      lib/readline.js
  8. 1
      lib/stream.js
  9. 1
      lib/tty.js
  10. 2
      lib/zlib.js
  11. 3
      test/internet/test-net-connect-timeout.js
  12. 2
      test/parallel/test-buffer-inspect.js
  13. 1
      test/parallel/test-buffer.js
  14. 3
      test/parallel/test-child-process-double-pipe.js
  15. 1
      test/parallel/test-child-process-exit-code.js
  16. 9
      test/parallel/test-domain.js
  17. 2
      test/parallel/test-event-emitter-num-args.js
  18. 2
      test/parallel/test-fs-read-stream-resume.js
  19. 1
      test/parallel/test-http-expect-continue.js
  20. 1
      test/parallel/test-https-strict.js
  21. 2
      test/parallel/test-module-nodemodulepaths.js
  22. 2
      test/parallel/test-require-dot.js
  23. 2
      test/parallel/test-require-extensions-main.js
  24. 1
      test/parallel/test-smalloc.js
  25. 2
      test/parallel/test-stream-unshift-empty-chunk.js
  26. 1
      test/parallel/test-stream2-readable-from-list.js
  27. 1
      test/parallel/test-stringbytes-external.js
  28. 1
      test/parallel/test-url.js
  29. 3
      test/parallel/test-vm-new-script-new-context.js
  30. 3
      test/parallel/test-zlib-random-byte-pipes.js
  31. 1
      test/parallel/test-zlib.js
  32. 3
      test/pummel/test-exec.js
  33. 1
      test/pummel/test-net-throttle.js
  34. 5
      test/pummel/test-regress-GH-814.js
  35. 2
      test/pummel/test-regress-GH-814_2.js
  36. 1
      test/pummel/test-stream2-basic.js
  37. 1
      test/sequential/test-pipe.js
  38. 2
      test/sequential/test-regress-GH-3542.js
  39. 2
      test/sequential/test-regress-GH-4948.js
  40. 5
      test/sequential/test-regress-GH-784.js

4
lib/_debugger.js

@ -641,10 +641,6 @@ Client.prototype.fullTrace = function(cb) {
}; };
const commands = [ const commands = [
[ [
'run (r)', 'run (r)',

1
lib/_http_server.js

@ -98,7 +98,6 @@ ServerResponse.prototype._finish = function() {
}; };
exports.ServerResponse = ServerResponse; exports.ServerResponse = ServerResponse;
ServerResponse.prototype.statusCode = 200; ServerResponse.prototype.statusCode = 200;

3
lib/_stream_readable.js

@ -167,7 +167,6 @@ function readableAddChunk(stream, state, chunk, encoding, addToFront) {
} }
// if it's past the high water mark, we can push in some more. // if it's past the high water mark, we can push in some more.
// Also, if we have no data yet, we can stand some // Also, if we have no data yet, we can stand some
// more bytes. This is to work around cases where hwm=0, // more bytes. This is to work around cases where hwm=0,
@ -547,7 +546,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
dest._events.error = [onerror, dest._events.error]; dest._events.error = [onerror, dest._events.error];
// Both close and finish should trigger unpipe, but only once. // Both close and finish should trigger unpipe, but only once.
function onclose() { function onclose() {
dest.removeListener('finish', onfinish); dest.removeListener('finish', onfinish);
@ -800,7 +798,6 @@ Readable.prototype.wrap = function(stream) {
}; };
// exposed for testing purposes only. // exposed for testing purposes only.
Readable._fromList = fromList; Readable._fromList = fromList;

3
lib/crypto.js

@ -280,7 +280,6 @@ Decipheriv.prototype.setAuthTag = Cipher.prototype.setAuthTag;
Decipheriv.prototype.setAAD = Cipher.prototype.setAAD; Decipheriv.prototype.setAAD = Cipher.prototype.setAAD;
exports.createSign = exports.Sign = Sign; exports.createSign = exports.Sign = Sign;
function Sign(algorithm, options) { function Sign(algorithm, options) {
if (!(this instanceof Sign)) if (!(this instanceof Sign))
@ -316,7 +315,6 @@ Sign.prototype.sign = function(options, encoding) {
}; };
exports.createVerify = exports.Verify = Verify; exports.createVerify = exports.Verify = Verify;
function Verify(algorithm, options) { function Verify(algorithm, options) {
if (!(this instanceof Verify)) if (!(this instanceof Verify))
@ -562,7 +560,6 @@ ECDH.prototype.getPublicKey = function getPublicKey(encoding, format) {
}; };
exports.pbkdf2 = function(password, exports.pbkdf2 = function(password,
salt, salt,
iterations, iterations,

4
lib/fs.js

@ -1596,7 +1596,6 @@ fs.realpath = function realpath(p, cache, cb) {
}; };
var pool; var pool;
function allocNewPool(poolSize) { function allocNewPool(poolSize) {
@ -1605,7 +1604,6 @@ function allocNewPool(poolSize) {
} }
fs.createReadStream = function(path, options) { fs.createReadStream = function(path, options) {
return new ReadStream(path, options); return new ReadStream(path, options);
}; };
@ -1778,8 +1776,6 @@ ReadStream.prototype.close = function(cb) {
}; };
fs.createWriteStream = function(path, options) { fs.createWriteStream = function(path, options) {
return new WriteStream(path, options); return new WriteStream(path, options);
}; };

1
lib/net.js

@ -1004,7 +1004,6 @@ Socket.prototype.unref = function() {
}; };
function afterConnect(status, handle, req, readable, writable) { function afterConnect(status, handle, req, readable, writable) {
var self = handle.owner; var self = handle.owner;

1
lib/readline.js

@ -889,7 +889,6 @@ Interface.prototype._ttyWrite = function(s, key) {
exports.Interface = Interface; exports.Interface = Interface;
/** /**
* accepts a readable Stream instance and makes it emit "keypress" events * accepts a readable Stream instance and makes it emit "keypress" events
*/ */

1
lib/stream.js

@ -16,7 +16,6 @@ Stream.PassThrough = require('_stream_passthrough');
Stream.Stream = Stream; Stream.Stream = Stream;
// old-style streams. Note that the pipe method (the only relevant // old-style streams. Note that the pipe method (the only relevant
// part of this class) is overridden in the Readable class. // part of this class) is overridden in the Readable class.

1
lib/tty.js

@ -49,7 +49,6 @@ ReadStream.prototype.setRawMode = function(flag) {
}; };
function WriteStream(fd) { function WriteStream(fd) {
if (!(this instanceof WriteStream)) return new WriteStream(fd); if (!(this instanceof WriteStream)) return new WriteStream(fd);
net.Socket.call(this, { net.Socket.call(this, {

2
lib/zlib.js

@ -241,7 +241,6 @@ function Inflate(opts) {
} }
// gzip - bigger header, same deflate compression // gzip - bigger header, same deflate compression
function Gzip(opts) { function Gzip(opts) {
if (!(this instanceof Gzip)) return new Gzip(opts); if (!(this instanceof Gzip)) return new Gzip(opts);
@ -254,7 +253,6 @@ function Gunzip(opts) {
} }
// raw - no header // raw - no header
function DeflateRaw(opts) { function DeflateRaw(opts) {
if (!(this instanceof DeflateRaw)) return new DeflateRaw(opts); if (!(this instanceof DeflateRaw)) return new DeflateRaw(opts);

3
test/internet/test-net-connect-timeout.js

@ -62,9 +62,6 @@ socket1.on('connect', function() {
}); });
process.on('exit', function() { process.on('exit', function() {
assert.ok(gotTimeout0); assert.ok(gotTimeout0);
assert.ok(!gotConnect0); assert.ok(!gotConnect0);

2
test/parallel/test-buffer-inspect.js

@ -35,4 +35,4 @@ buffer.INSPECT_MAX_BYTES = Infinity;
assert.doesNotThrow(function() { assert.doesNotThrow(function() {
assert.strictEqual(util.inspect(b), expected); assert.strictEqual(util.inspect(b), expected);
assert.strictEqual(util.inspect(s), expected); assert.strictEqual(util.inspect(s), expected);
}); });

1
test/parallel/test-buffer.js

@ -314,7 +314,6 @@ assert.equal(b, c.parent);
assert.equal(b, d.parent); assert.equal(b, d.parent);
// Bug regression test // Bug regression test
var testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語 var testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語
var buffer = new Buffer(32); var buffer = new Buffer(32);

3
test/parallel/test-child-process-double-pipe.js

@ -35,7 +35,6 @@ if (is_windows) {
*/ */
// pipe echo | grep // pipe echo | grep
echo.stdout.on('data', function(data) { echo.stdout.on('data', function(data) {
console.error('grep stdin write ' + data.length); console.error('grep stdin write ' + data.length);
@ -66,7 +65,6 @@ sed.on('exit', function() {
}); });
// pipe grep | sed // pipe grep | sed
grep.stdout.on('data', function(data) { grep.stdout.on('data', function(data) {
console.error('grep stdout ' + data.length); console.error('grep stdout ' + data.length);
@ -86,7 +84,6 @@ grep.stdout.on('end', function(code) {
}); });
var result = ''; var result = '';
// print sed's output // print sed's output

1
test/parallel/test-child-process-exit-code.js

@ -16,7 +16,6 @@ exitChild.on('exit', function(code, signal) {
}); });
var errorScript = path.join(common.fixturesDir, var errorScript = path.join(common.fixturesDir,
'child_process_should_emit_error.js'); 'child_process_should_emit_error.js');
var errorChild = spawn(process.argv[0], [errorScript]); var errorChild = spawn(process.argv[0], [errorScript]);

9
test/parallel/test-domain.js

@ -105,7 +105,6 @@ d.on('error', function(er) {
}); });
process.on('exit', function() { process.on('exit', function() {
console.error('exit', caught, expectCaught); console.error('exit', caught, expectCaught);
assert.equal(caught, expectCaught, 'caught the expected number of errors'); assert.equal(caught, expectCaught, 'caught the expected number of errors');
@ -113,7 +112,6 @@ process.on('exit', function() {
}); });
// revert to using the domain when a callback is passed to nextTick in // revert to using the domain when a callback is passed to nextTick in
// the middle of a tickCallback loop // the middle of a tickCallback loop
d.run(function() { d.run(function() {
@ -124,7 +122,6 @@ d.run(function() {
expectCaught++; expectCaught++;
// catch thrown errors no matter how many times we enter the event loop // catch thrown errors no matter how many times we enter the event loop
// this only uses implicit binding, except for the first function // this only uses implicit binding, except for the first function
// passed to d.run(). The rest are implicitly bound by virtue of being // passed to d.run(). The rest are implicitly bound by virtue of being
@ -146,7 +143,6 @@ d.run(function() {
expectCaught++; expectCaught++;
// implicit addition of a timer created within a domain-bound context. // implicit addition of a timer created within a domain-bound context.
d.run(function() { d.run(function() {
setTimeout(function() { setTimeout(function() {
@ -156,14 +152,12 @@ d.run(function() {
expectCaught++; expectCaught++;
// Event emitters added to the domain have their errors routed. // Event emitters added to the domain have their errors routed.
d.add(e); d.add(e);
e.emit('error', new Error('emitted')); e.emit('error', new Error('emitted'));
expectCaught++; expectCaught++;
// get rid of the `if (er) return cb(er)` malarky, by intercepting // get rid of the `if (er) return cb(er)` malarky, by intercepting
// the cb functions to the domain, and using the intercepted function // the cb functions to the domain, and using the intercepted function
// as a callback instead. // as a callback instead.
@ -177,7 +171,6 @@ bound(new Error('bound'));
expectCaught++; expectCaught++;
// intercepted should never pass first argument to callback // intercepted should never pass first argument to callback
function fn2(data) { function fn2(data) {
assert.equal(data, 'data', 'should not be null err argument'); assert.equal(data, 'data', 'should not be null err argument');
@ -208,7 +201,6 @@ setTimeout(d.bind(thrower), 100);
expectCaught++; expectCaught++;
// Pass an intercepted function to an fs operation that fails. // Pass an intercepted function to an fs operation that fails.
fs.open('this file does not exist', 'r', d.intercept(function(er) { fs.open('this file does not exist', 'r', d.intercept(function(er) {
console.error('should not get here!', er); console.error('should not get here!', er);
@ -217,7 +209,6 @@ fs.open('this file does not exist', 'r', d.intercept(function(er) {
expectCaught++; expectCaught++;
// implicit addition by being created within a domain-bound context. // implicit addition by being created within a domain-bound context.
var implicit; var implicit;

2
test/parallel/test-event-emitter-num-args.js

@ -24,5 +24,3 @@ e.emit('numArgs', null, null, null, null, null);
process.on('exit', function() { process.on('exit', function() {
assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited); assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited);
}); });

2
test/parallel/test-fs-read-stream-resume.js

@ -18,7 +18,7 @@ stream.on('data', function(chunk) {
stream.resume(); stream.resume();
} }
}); });
process.nextTick(function() { process.nextTick(function() {
stream.pause(); stream.pause();
setTimeout(function() { setTimeout(function() {

1
test/parallel/test-http-expect-continue.js

@ -31,7 +31,6 @@ server.on('checkContinue', function(req, res) {
server.listen(common.PORT); server.listen(common.PORT);
server.on('listening', function() { server.on('listening', function() {
var req = http.request({ var req = http.request({
port: common.PORT, port: common.PORT,

1
test/parallel/test-https-strict.js

@ -79,7 +79,6 @@ var responseCount = 0;
var pending = 0; var pending = 0;
function server(options, port) { function server(options, port) {
var s = https.createServer(options, handler); var s = https.createServer(options, handler);
s.requests = []; s.requests = [];

2
test/parallel/test-module-nodemodulepaths.js

@ -19,4 +19,4 @@ if (isWindows) {
paths = module._nodeModulePaths(file); paths = module._nodeModulePaths(file);
assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1); assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1);
assert.ok(Array.isArray(paths)); assert.ok(Array.isArray(paths));

2
test/parallel/test-require-dot.js

@ -14,4 +14,4 @@ module._initPaths();
var c = require('.'); var c = require('.');
assert.equal(c.value, 42, 'require(".") should honor NODE_PATH'); assert.equal(c.value, 42, 'require(".") should honor NODE_PATH');

2
test/parallel/test-require-extensions-main.js

@ -2,4 +2,4 @@
var common = require('../common'); var common = require('../common');
var assert = require('assert'); var assert = require('assert');
require(common.fixturesDir + '/require-bin/bin/req.js'); require(common.fixturesDir + '/require-bin/bin/req.js');

1
test/parallel/test-smalloc.js

@ -155,7 +155,6 @@ assert.equal(b[0], 0xff);
assert.equal(b[1], 0xff); assert.equal(b[1], 0xff);
// verify checking external if has external memory // verify checking external if has external memory
// check objects // check objects

2
test/parallel/test-stream-unshift-empty-chunk.js

@ -2,7 +2,7 @@
var common = require('../common'); var common = require('../common');
var assert = require('assert'); var assert = require('assert');
// This test verifies that stream.unshift(Buffer(0)) or // This test verifies that stream.unshift(Buffer(0)) or
// stream.unshift('') does not set state.reading=false. // stream.unshift('') does not set state.reading=false.
var Readable = require('stream').Readable; var Readable = require('stream').Readable;

1
test/parallel/test-stream2-readable-from-list.js

@ -38,7 +38,6 @@ process.on('exit', function() {
process.nextTick(run); process.nextTick(run);
test('buffers', function(t) { test('buffers', function(t) {
// have a length // have a length
var len = 16; var len = 16;

1
test/parallel/test-stringbytes-external.js

@ -49,7 +49,6 @@ assert.equal(c_bin.toString('binary'), ucs2_control);
assert.equal(c_ucs.toString('binary'), ucs2_control); assert.equal(c_ucs.toString('binary'), ucs2_control);
// now let's test BASE64 and HEX ecoding/decoding // now let's test BASE64 and HEX ecoding/decoding
var RADIOS = 2; var RADIOS = 2;
var PRE_HALF_APEX = Math.ceil(EXTERN_APEX / 2) - RADIOS; var PRE_HALF_APEX = Math.ceil(EXTERN_APEX / 2) - RADIOS;

1
test/parallel/test-url.js

@ -1562,7 +1562,6 @@ relativeTests2.forEach(function(relativeTest) {
}); });
// https://github.com/nodejs/io.js/pull/1036 // https://github.com/nodejs/io.js/pull/1036
var throws = [ var throws = [
undefined, undefined,

3
test/parallel/test-vm-new-script-new-context.js

@ -20,7 +20,6 @@ assert.throws(function() {
}, /test/); }, /test/);
console.error('undefined reference'); console.error('undefined reference');
var error; var error;
script = new Script('foo.bar = 5;'); script = new Script('foo.bar = 5;');
@ -67,5 +66,3 @@ console.error('invalid this');
assert.throws(function() { assert.throws(function() {
script.runInNewContext.call('\'hello\';'); script.runInNewContext.call('\'hello\';');
}, TypeError); }, TypeError);

3
test/parallel/test-zlib-random-byte-pipes.js

@ -14,7 +14,6 @@ var util = require('util');
var zlib = require('zlib'); var zlib = require('zlib');
// emit random bytes, and keep a shasum // emit random bytes, and keep a shasum
function RandomReadStream(opt) { function RandomReadStream(opt) {
Stream.call(this); Stream.call(this);
@ -130,8 +129,6 @@ HashStream.prototype.end = function(c) {
}; };
var inp = new RandomReadStream({ total: 1024, block: 256, jitter: 16 }); var inp = new RandomReadStream({ total: 1024, block: 256, jitter: 16 });
var out = new HashStream(); var out = new HashStream();
var gzip = zlib.createGzip(); var gzip = zlib.createGzip();

1
test/parallel/test-zlib.js

@ -133,7 +133,6 @@ SlowStream.prototype.end = function(chunk) {
}; };
// for each of the files, make sure that compressing and // for each of the files, make sure that compressing and
// decompressing results in the same data, for every combination // decompressing results in the same data, for every combination
// of the options set above. // of the options set above.

3
test/pummel/test-exec.js

@ -50,7 +50,6 @@ exec('thisisnotavalidcommand', function(err, stdout, stderr) {
}); });
var sleeperStart = new Date(); var sleeperStart = new Date();
exec(SLEEP3_COMMAND, { timeout: 50 }, function(err, stdout, stderr) { exec(SLEEP3_COMMAND, { timeout: 50 }, function(err, stdout, stderr) {
var diff = (new Date()) - sleeperStart; var diff = (new Date()) - sleeperStart;
@ -62,8 +61,6 @@ exec(SLEEP3_COMMAND, { timeout: 50 }, function(err, stdout, stderr) {
}); });
var startSleep3 = new Date(); var startSleep3 = new Date();
var killMeTwice = exec(SLEEP3_COMMAND, {timeout: 1000}, killMeTwiceCallback); var killMeTwice = exec(SLEEP3_COMMAND, {timeout: 1000}, killMeTwiceCallback);

1
test/pummel/test-net-throttle.js

@ -55,7 +55,6 @@ server.listen(common.PORT, function() {
}); });
process.on('exit', function() { process.on('exit', function() {
assert.equal(N, chars_recved); assert.equal(N, chars_recved);
assert.equal(true, npauses > 2); assert.equal(true, npauses > 2);

5
test/pummel/test-regress-GH-814.js

@ -19,14 +19,12 @@ var testFileFD = fs.openSync(testFileName, 'w');
console.log(testFileName); console.log(testFileName);
var kBufSize = 128 * 1024; var kBufSize = 128 * 1024;
var PASS = true; var PASS = true;
var neverWrittenBuffer = newBuffer(kBufSize, 0x2e); //0x2e === '.' var neverWrittenBuffer = newBuffer(kBufSize, 0x2e); //0x2e === '.'
var bufPool = []; var bufPool = [];
var tail = require('child_process').spawn('tail', ['-f', testFileName]); var tail = require('child_process').spawn('tail', ['-f', testFileName]);
tail.stdout.on('data', tailCB); tail.stdout.on('data', tailCB);
@ -35,7 +33,6 @@ function tailCB(data) {
} }
var timeToQuit = Date.now() + 8e3; //Test during no more than this seconds. var timeToQuit = Date.now() + 8e3; //Test during no more than this seconds.
(function main() { (function main() {
@ -68,5 +65,3 @@ function cb(err, written) {
throw err; throw err;
} }
} }

2
test/pummel/test-regress-GH-814_2.js

@ -70,8 +70,6 @@ function writerCB(err, written) {
} }
// ******************* UTILITIES // ******************* UTILITIES

1
test/pummel/test-stream2-basic.js

@ -168,7 +168,6 @@ test('pipe', function(t) {
}); });
[1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(function(SPLIT) { [1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(function(SPLIT) {
test('unpipe', function(t) { test('unpipe', function(t) {
var r = new TestReader(5); var r = new TestReader(5);

1
test/sequential/test-pipe.js

@ -51,7 +51,6 @@ var web = http.Server(function(req, res) {
web.listen(webPort, startClient); web.listen(webPort, startClient);
var tcp = net.Server(function(s) { var tcp = net.Server(function(s) {
tcp.close(); tcp.close();

2
test/sequential/test-regress-GH-3542.js

@ -31,4 +31,4 @@ test(process.env.windir);
process.on('exit', function() { process.on('exit', function() {
assert.strictEqual(succeeded, 7); assert.strictEqual(succeeded, 7);
}); });

2
test/sequential/test-regress-GH-4948.js

@ -40,4 +40,4 @@ sock.connect(common.PORT, 'localhost');
sock.on('connect', function() { sock.on('connect', function() {
sock.write('GET / HTTP/1.1\r\n\r\n'); sock.write('GET / HTTP/1.1\r\n\r\n');
sock.end(); sock.end();
}); });

5
test/sequential/test-regress-GH-784.js

@ -117,18 +117,13 @@ function ping() {
} }
function pingping() { function pingping() {
ping(); ping();
ping(); ping();
} }
pingping(); pingping();
process.on('exit', function() { process.on('exit', function() {
console.error("process.on('exit')"); console.error("process.on('exit')");
console.error(responses); console.error(responses);

Loading…
Cancel
Save