frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add optional timeout to exec node

Browse Source 
(both exec and spawn modes)
and add test for it (both exec and spawn)
also extra test for trigger node.
This commit is contained in:
Dave Conway-Jones
2016-04-27 22:32:58 +01:00
parent 4ad540412a
commit bd59398cab
5 changed files with 142 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ describe('exec node', function() {
n1.should.have.property("cmd", "");
n1.should.have.property("append", "");
n1.should.have.property("addpay",true);
n1.should.have.property("timer",0);
done();
});
});
@@ -139,6 +140,33 @@ describe('exec node', function() {
n1.receive({});
});
});
it('should be able to timeout a long running command', function(done) {
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"sleep", addpay:false, append:"1", timer:"0.3"},
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
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");
n4.on("input", function(msg) {
msg.should.have.property("payload");
msg.payload.should.have.property("killed",true);
//done();
});
setTimeout(function() {
var logEvents = helper.log().args.filter(function(evt) {
return evt[0].type == "exec";
});
logEvents.should.have.length(2);
logEvents[1][0].should.have.a.property('msg');
logEvents[1][0].msg.toString().should.startWith("Exec node timeout");
done();
},400);
n1.receive({});
});
});
});
describe('calling spawn', function() {
@@ -267,5 +295,31 @@ describe('exec node', function() {
});
});
it('should be able to timeout a long running command', function(done) {
var flow = [{id:"n1",type:"exec",wires:[["n2"],["n3"],["n4"]],command:"sleep", addpay:false, append:"1", timer:"0.3", useSpawn:true},
{id:"n2", type:"helper"},{id:"n3", type:"helper"},{id:"n4", type:"helper"}];
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");
n4.on("input", function(msg) {
msg.should.have.property("payload",null);
//done();
});
setTimeout(function() {
var logEvents = helper.log().args.filter(function(evt) {
return evt[0].type == "exec";
});
logEvents.should.have.length(2);
logEvents[1][0].should.have.a.property('msg');
logEvents[1][0].msg.toString().should.startWith("Exec node timeout");
done();
},400);
n1.receive({});
});
});
});
});

29
test/nodes/core/core/89-trigger_spec.js
View File

@@ -264,6 +264,35 @@ describe('trigger Node', function() {
});
});
it('should be able output the 2nd payload', function(done) {
var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", extend:"false", op1type:"nul", op2type:"payl", op1:"false", op2:"true", duration:200, wires:[["n2"]] },
{id:"n2", type:"helper"} ];
helper.load(triggerNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
var c = 0;
n2.on("input", function(msg) {
if (c === 0) {
msg.should.have.a.property("payload", "Goodbye");
c += 1;
}
else {
msg.should.have.a.property("payload", "World");
(Date.now() - ss).should.be.greaterThan(380);
done();
}
});
var ss = Date.now();
n1.emit("input", {payload:"Hello"});
setTimeout( function() {
n1.emit("input", {payload:"Goodbye"});
},100);
setTimeout( function() {
n1.emit("input", {payload:"World"});
},400);
});
});
it('should be able to apply mustache templates to payloads', function(done) {
var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"val", op1:"{{payload}}", op2:"{{topic}}", duration:50, wires:[["n2"]] },
{id:"n2", type:"helper"} ];