Skip to content

Commit

Permalink
test: improve code in test-domain-multi
Browse files Browse the repository at this point in the history
* use common.mustCall to validate functions executions
* use common.fail to control error
* remove unnecessary variables
* remove unnecessary assertions
* remove console.log and console.error
* use arrow functions

PR-URL: #10798
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
edsadr authored and jasnell committed Mar 8, 2017
1 parent 3c5f65f commit b70f977
Showing 1 changed file with 13 additions and 36 deletions.
49 changes: 13 additions & 36 deletions test/parallel/test-domain-multi.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
'use strict';
// Tests of multiple domains happening at once.

require('../common');
var assert = require('assert');
var domain = require('domain');

var caughtA = false;
var caughtB = false;
var caughtC = false;

const common = require('../common');
const domain = require('domain');
const http = require('http');

var a = domain.create();
a.enter(); // this will be our "root" domain
a.on('error', function(er) {
caughtA = true;
console.log('This should not happen');
throw er;
});

a.on('error', common.fail);

var http = require('http');
var server = http.createServer(function(req, res) {
const server = http.createServer((req, res) => {
// child domain of a.
var b = domain.create();
a.add(b);
Expand All @@ -31,47 +21,34 @@ var server = http.createServer(function(req, res) {
b.add(req);
b.add(res);

b.on('error', function(er) {
caughtB = true;
console.error('Error encountered', er);
b.on('error', common.mustCall((er) => {
if (res) {
res.writeHead(500);
res.end('An error occurred');
}
// res.writeHead(500), res.destroy, etc.
server.close();
});
}));

// XXX this bind should not be necessary.
// the write cb behavior in http/net should use an
// event so that it picks up the domain handling.
res.write('HELLO\n', b.bind(function() {
res.write('HELLO\n', b.bind(() => {
throw new Error('this kills domain B, not A');
}));

}).listen(0, function() {
var c = domain.create();
var req = http.get({ host: 'localhost', port: this.address().port });
}).listen(0, () => {
const c = domain.create();
const req = http.get({ host: 'localhost', port: server.address().port });

// add the request to the C domain
c.add(req);

req.on('response', function(res) {
console.error('got response');
req.on('response', (res) => {
// add the response object to the C domain
c.add(res);
res.pipe(process.stdout);
});

c.on('error', function(er) {
caughtC = true;
console.error('Error on c', er.message);
});
});

process.on('exit', function() {
assert.strictEqual(caughtA, false);
assert.strictEqual(caughtB, true);
assert.strictEqual(caughtC, true);
console.log('ok - Errors went where they were supposed to go');
c.on('error', common.mustCall((er) => { }));
});

0 comments on commit b70f977

Please sign in to comment.