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

try to increase coverage for exec and template nodes

Browse Source 
(works locally - may fail on travis - lets see…)
This commit is contained in:
Dave Conway-Jones
2016-04-23 17:09:46 +01:00
parent 2801838ffa
commit 8dacf72b3c
3 changed files with 133 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ module.exports = function(RED) {
// slice whole line by spaces (trying to honour quotes);
arg = arg.match(/(?:[^\s"]+|"[^"]*")+/g);
var cmd = arg.shift();
/* istanbul ignore else */
if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
if (cmd.indexOf(" ") == -1) {
var ex = spawn(cmd,arg);
@@ -78,8 +79,9 @@ module.exports = function(RED) {
}
else {
var cl = node.cmd;
if ((node.addpay === true) && ((msg.payload.toString() || "").trim() !== "")) { cl += " "+msg.payload; }
if ((node.addpay === true) && ((msg.payload || "").toString().trim() !== "")) { cl += " "+msg.payload; }
if (node.append.trim() !== "") { cl += " "+node.append; }
/* istanbul ignore else */
if (RED.settings.verbose) { node.log(cl); }
var child = exec(cl, {encoding: 'binary', maxBuffer:10000000}, function (error, stdout, stderr) {
msg.payload = new Buffer(stdout,"binary");
@@ -100,12 +102,13 @@ module.exports = function(RED) {
node.send([msg,msg2,msg3]);
delete node.activeProcesses[child.pid];
});
child.on('error',function(){})
child.on('error',function() {});
node.activeProcesses[child.pid] = child;
}
});
this.on('close',function() {
for (var pid in node.activeProcesses) {
/* istanbul ignore else */
if (node.activeProcesses.hasOwnProperty(pid)) {
node.activeProcesses[pid].kill();
}