Skip to content

Commit 325c613

Browse files
knollearyknolleary
committed
Defeat the exec node test dragons
1 parent fdea19a commit 325c613

2 files changed

Lines changed: 53 additions & 36 deletions

File tree

‎nodes/core/core/75-exec.js‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ module.exports = function(RED) {
3232
var node = this;
3333

3434
var cleanup = function(p) {
35-
//console.log("CLEANUP!!!",p);
3635
node.activeProcesses[p].kill();
3736
node.status({fill:"red",shape:"dot",text:"timeout"});
3837
node.error("Exec node timeout");
@@ -53,37 +52,44 @@ module.exports = function(RED) {
5352
/* istanbul ignore else */
5453
if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
5554
child = spawn(cmd,arg);
55+
var unknownCommand = (child.pid === undefined);
5656
if (node.timer !== 0) {
5757
child.tout = setTimeout(function() { cleanup(child.pid); }, node.timer);
5858
}
5959
node.activeProcesses[child.pid] = child;
6060
child.stdout.on('data', function (data) {
61-
//console.log('[exec] stdout: ' + data);
62-
if (isUtf8(data)) { msg.payload = data.toString(); }
63-
else { msg.payload = data; }
64-
node.send([RED.util.cloneMessage(msg),null,null]);
61+
if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
62+
// console.log('[exec] stdout: ' + data,child.pid);
63+
if (isUtf8(data)) { msg.payload = data.toString(); }
64+
else { msg.payload = data; }
65+
node.send([RED.util.cloneMessage(msg),null,null]);
66+
}
6567
});
6668
child.stderr.on('data', function (data) {
67-
//console.log('[exec] stderr: ' + data);
68-
if (isUtf8(data)) { msg.payload = data.toString(); }
69-
else { msg.payload = new Buffer(data); }
70-
node.send([null,RED.util.cloneMessage(msg),null]);
69+
if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
70+
if (isUtf8(data)) { msg.payload = data.toString(); }
71+
else { msg.payload = new Buffer(data); }
72+
node.send([null,RED.util.cloneMessage(msg),null]);
73+
}
7174
});
7275
child.on('close', function (code) {
73-
//console.log('[exec] result: ' + code);
74-
delete node.activeProcesses[child.pid];
75-
if (child.tout) { clearTimeout(child.tout); }
76-
msg.payload = code;
77-
if (code === 0) { node.status({}); }
78-
if (code === null) { node.status({fill:"red",shape:"dot",text:"timeout"}); }
79-
else if (code < 0) { node.status({fill:"red",shape:"dot",text:"rc: "+code}); }
80-
else { node.status({fill:"yellow",shape:"dot",text:"rc: "+code}); }
81-
node.send([null,null,RED.util.cloneMessage(msg)]);
76+
if (unknownCommand || (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null)) {
77+
delete node.activeProcesses[child.pid];
78+
if (child.tout) { clearTimeout(child.tout); }
79+
msg.payload = code;
80+
if (code === 0) { node.status({}); }
81+
if (code === null) { node.status({fill:"red",shape:"dot",text:"timeout"}); }
82+
else if (code < 0) { node.status({fill:"red",shape:"dot",text:"rc: "+code}); }
83+
else { node.status({fill:"yellow",shape:"dot",text:"rc: "+code}); }
84+
node.send([null,null,RED.util.cloneMessage(msg)]);
85+
}
8286
});
8387
child.on('error', function (code) {
84-
delete node.activeProcesses[child.pid];
8588
if (child.tout) { clearTimeout(child.tout); }
86-
node.error(code,RED.util.cloneMessage(msg));
89+
delete node.activeProcesses[child.pid];
90+
if (node.activeProcesses.hasOwnProperty(child.pid) && node.activeProcesses[child.pid] !== null) {
91+
node.error(code,RED.util.cloneMessage(msg));
92+
}
8793
});
8894
}
8995
else {
@@ -120,7 +126,10 @@ module.exports = function(RED) {
120126
/* istanbul ignore else */
121127
if (node.activeProcesses.hasOwnProperty(pid)) {
122128
if (node.activeProcesses[pid].tout) { clearTimeout(node.activeProcesses[pid].tout); }
123-
node.activeProcesses[pid].kill();
129+
// console.log("KILLLING",pid);
130+
var process = node.activeProcesses[pid];
131+
node.activeProcesses[pid] = null;
132+
process.kill();
124133
}
125134
}
126135
node.activeProcesses = {};

‎test/nodes/core/core/75-exec_spec.js‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -327,23 +327,31 @@ describe('exec node', function() {
327327
});
328328
});
329329

330-
it('should return an error for a bad command', function(done) {
331-
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"madeupcommandshouldfail", addpay:false, append:"", useSpawn:true},
332-
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
333-
helper.load(execNode, flow, function() {
334-
var n1 = helper.getNode("n1");
335-
var n2 = helper.getNode("n2");
336-
var n3 = helper.getNode("n3");
337-
var n4 = helper.getNode("n4");
338-
n4.on("input", function(msg) {
339-
msg.should.have.property("payload");
340-
msg.payload.should.be.a.Number();
341-
msg.payload.should.be.below(0);
342-
done();
330+
if (!/^v0.10/.test(process.version)) {
331+
it('should return an error for a bad command', function(done) {
332+
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"madeupcommandshouldfail", addpay:false, append:"", useSpawn:true},
333+
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
334+
helper.load(execNode, flow, function() {
335+
var n1 = helper.getNode("n1");
336+
var n2 = helper.getNode("n2");
337+
var n3 = helper.getNode("n3");
338+
var n4 = helper.getNode("n4");
339+
n4.on("input", function(msg) {
340+
if (/^v0.10/.test(process.version)) {
341+
msg.should.have.property("payload");
342+
msg.payload.should.be.a.Number();
343+
msg.payload.should.be.below(0);
344+
} else {
345+
msg.should.have.property("payload");
346+
msg.payload.should.be.a.Number();
347+
msg.payload.should.be.below(0);
348+
}
349+
done();
350+
});
351+
n1.receive({payload:null});
343352
});
344-
n1.receive({payload:null});
345353
});
346-
});
354+
}
347355

348356
it('should return an error for a failing command', function(done) {
349357
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"mkdir /foo/bar/doo/dah", addpay:false, append:"", useSpawn:true},

0 commit comments

Comments
 (0)