Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: avoid assigning this to variables #10548

Merged
merged 1 commit into from
Jan 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/parallel/test-cluster-worker-wait-server-close.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ if (cluster.isWorker) {
// start worker
var worker = cluster.fork();

var socket;
// Disconnect worker when it is ready
worker.once('listening', function() {
net.createConnection(common.PORT, common.localhostIPv4, function() {
socket = this;
this.on('data', function() {
const socket = net.createConnection(common.PORT, common.localhostIPv4);

socket.on('connect', function() {
socket.on('data', function() {
console.log('got data from client');
// socket definitely connected to worker if we got data
worker.disconnect();
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-http-client-timeout-agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@ server.listen(0, options.host, function() {
this.destroy();
});
req.setTimeout(50, function() {
var req = this;
console.log('req#' + this.id + ' timeout');
req.abort();
this.abort();
requests_done += 1;
});
req.end();
Expand Down
14 changes: 6 additions & 8 deletions test/parallel/test-repl-persistent-history.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@ os.homedir = function() {
class ActionStream extends stream.Stream {
run(data) {
const _iter = data[Symbol.iterator]();
const self = this;

function doAction() {
const doAction = () => {
const next = _iter.next();
if (next.done) {
// Close the repl. Note that it must have a clean prompt to do so.
setImmediate(function() {
self.emit('keypress', '', { ctrl: true, name: 'd' });
setImmediate(() => {
this.emit('keypress', '', { ctrl: true, name: 'd' });
});
return;
}
const action = next.value;

if (typeof action === 'object') {
self.emit('keypress', '', action);
this.emit('keypress', '', action);
} else {
self.emit('data', action + '\n');
this.emit('data', action + '\n');
}
setImmediate(doAction);
}
};
setImmediate(doAction);
}
resume() {}
Expand Down
32 changes: 16 additions & 16 deletions test/parallel/test-zlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,24 @@ SlowStream.prototype.pause = function() {
};

SlowStream.prototype.resume = function() {
var self = this;
if (self.ended) return;
self.emit('resume');
if (!self.chunk) return;
self.paused = false;
emit();
function emit() {
if (self.paused) return;
if (self.offset >= self.length) {
self.ended = true;
return self.emit('end');
const emit = () => {
if (this.paused) return;
if (this.offset >= this.length) {
this.ended = true;
return this.emit('end');
}
var end = Math.min(self.offset + self.trickle, self.length);
var c = self.chunk.slice(self.offset, end);
self.offset += c.length;
self.emit('data', c);
var end = Math.min(this.offset + this.trickle, this.length);
var c = this.chunk.slice(this.offset, end);
this.offset += c.length;
this.emit('data', c);
process.nextTick(emit);
}
};

if (this.ended) return;
this.emit('resume');
if (!this.chunk) return;
this.paused = false;
emit();
};

SlowStream.prototype.end = function(chunk) {
Expand Down