frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

merge exec fixes

Browse Source
This commit is contained in:
Nick O'Leary 2017-03-02 13:41:01 +00:00
commit 6cf53c611b
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 92 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodes/core/core/75-exec.js
View File

@ -119,14 +119,16 @@ module.exports = function(RED) {
if(stderr) { if(stderr) {
msg2 = {payload: stderr}; msg2 = {payload: stderr};
} }
var msg3 = {payload:0}; var msg3 = null;
node.status({}); node.status({});
//console.log('[exec] stdout: ' + stdout); //console.log('[exec] stdout: ' + stdout);
//console.log('[exec] stderr: ' + stderr); //console.log('[exec] stderr: ' + stderr);
if (error !== null) { if (error !== null) {
msg3 = {payload:error.code}; msg3 = {payload:error};
node.status({fill:"red",shape:"dot",text:"error: "+error.code}); node.status({fill:"red",shape:"dot",text:"error: "+error.code});
//console.log('[exec] error: ' + error); //console.log('[exec] error: ' + error);
} else {
msg3 = {payload:{code:0}};
} }
if (!msg3) { node.status({}); } if (!msg3) { node.status({}); }
node.send([msg,msg2,msg3]); node.send([msg,msg2,msg3]);

104
test/nodes/core/core/75-exec_spec.js
View File

@ -52,11 +52,11 @@ describe('exec node', function() {
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo", addpay:false, append:""}, var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"echo", addpay:false, append:""},
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}]; {id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
var spy = sinon.stub(child_process, 'exec', var spy = sinon.stub(child_process, 'exec',
function(arg1,arg2,arg3,arg4) { function(arg1,arg2,arg3,arg4) {
//console.log(arg1); //console.log(arg1);
// arg3(error,stdout,stderr); // arg3(error,stdout,stderr);
arg3(null,arg1,arg1.toUpperCase()); arg3(null,arg1,arg1.toUpperCase());
}); });
helper.load(execNode, flow, function() { helper.load(execNode, flow, function() {
var n1 = helper.getNode("n1"); var n1 = helper.getNode("n1");
@ -64,13 +64,13 @@ describe('exec node', function() {
var n3 = helper.getNode("n3"); var n3 = helper.getNode("n3");
var n4 = helper.getNode("n4"); var n4 = helper.getNode("n4");
var received = 0; var received = 0;
var messages = [null,null]; var messages = [null,null,null];
var completeTest = function() { var completeTest = function() {
received++; received++;
if (received < 2) { if (received < 3) {
return; return;
} }
try { try{
var msg = messages[0]; var msg = messages[0];
msg.should.have.property("payload"); msg.should.have.property("payload");
msg.payload.should.be.a.String(); msg.payload.should.be.a.String();
@ -78,8 +78,13 @@ describe('exec node', function() {
msg = messages[1]; msg = messages[1];
msg.should.have.property("payload"); msg.should.have.property("payload");
msg.payload.should.be.a.String; msg.payload.should.be.a.String,
msg.payload.should.equal("ECHO"); msg.payload.should.equal("ECHO");
msg = messages[2];
msg.should.have.property("payload");
msg.payload.should.have.property("code",0);
child_process.exec.restore(); child_process.exec.restore();
done(); done();
} catch(err) { } catch(err) {
@ -95,6 +100,10 @@ describe('exec node', function() {
messages[1] = msg; messages[1] = msg;
completeTest(); completeTest();
}); });
n4.on("input", function(msg) {
messages[2] = msg;
completeTest();
});
n1.receive({payload:"and"}); n1.receive({payload:"and"});
}); });
}); });
@ -220,10 +229,14 @@ describe('exec node', function() {
var n3 = helper.getNode("n3"); var n3 = helper.getNode("n3");
var n4 = helper.getNode("n4"); var n4 = helper.getNode("n4");
n4.on("input", function(msg) { n4.on("input", function(msg) {
msg.should.have.property("payload"); try {
msg.payload.should.have.property("killed",true); msg.should.have.property("payload");
msg.payload.should.have.property("signal","SIGTERM"); msg.payload.should.have.property("killed",true);
done(); msg.payload.should.have.property("signal","SIGTERM");
done();
} catch(err) {
done(err);
}
}); });
setTimeout(function() { setTimeout(function() {
n1.receive({kill:true}); n1.receive({kill:true});
@ -231,6 +244,67 @@ describe('exec node', function() {
n1.receive({}); n1.receive({});
}); });
}); });
it('should return the rc for a failing command', function(done) {
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"error", addpay:false, append:""},
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
var spy = sinon.stub(child_process, 'exec',
function(arg1,arg2,arg3,arg4) {
//console.log(arg1);
// arg3(error,stdout,stderr);
arg3({code: 1},arg1,arg1.toUpperCase());
});
helper.load(execNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
var n3 = helper.getNode("n3");
var n4 = helper.getNode("n4");
var received = 0;
var messages = [null,null,null];
var completeTest = function() {
received++;
if (received < 3) {
return;
}
try{
var msg = messages[0];
msg.should.have.property("payload");
msg.payload.should.be.a.String();
msg.payload.should.equal("error");
msg = messages[1];
msg.should.have.property("payload");
msg.payload.should.be.a.String,
msg.payload.should.equal("ERROR");
msg = messages[2];
msg.should.have.property("payload");
msg.payload.should.have.property("code",1);
child_process.exec.restore();
done();
} catch(err) {
child_process.exec.restore();
done(err);
}
};
n2.on("input", function(msg) {
messages[0] = msg;
completeTest();
});
n3.on("input", function(msg) {
messages[1] = msg;
completeTest();
});
n4.on("input", function(msg) {
messages[2] = msg;
completeTest();
});
n1.receive({payload:"and"});
});
});
}); });
describe('calling spawn', function() { describe('calling spawn', function() {
@ -388,9 +462,7 @@ describe('exec node', function() {
msg.payload.should.equal("mkdir: /foo/bar/doo: No such file or directory\n"); msg.payload.should.equal("mkdir: /foo/bar/doo: No such file or directory\n");
}); });
n4.on("input", function(msg) { n4.on("input", function(msg) {
msg.should.have.property("payload"); msg.should.have.property("payload",1);
msg.payload.should.be.a.Number();
msg.payload.should.equal(1);
done(); done();
}); });
n1.receive({payload:null}); n1.receive({payload:null});