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 pull request #1627 from node-red-hitachi/fix-batch-concat-mode-msg-modification

Browse Source 
fixed message modificcation of concat mode of BATCH node
This commit is contained in:
Nick O'Leary 2018-02-13 23:45:19 +00:00 committed by GitHub
commit 5fb3ffc240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/logic/19-batch.js
View File

@ -116,7 +116,7 @@ module.exports = function(RED) {
for (var topic of topics) { for (var topic of topics) {
remove_topic(pending, topic); remove_topic(pending, topic);
} }
send_msgs(node, msgs, false); send_msgs(node, msgs, true);
node.pending_count -= msgs.length; node.pending_count -= msgs.length;
} }

18
test/nodes/core/logic/19-batch_spec.js
View File

@ -54,8 +54,13 @@ describe('BATCH node', function() {
var ix0 = 0; // seq no var ix0 = 0; // seq no
var ix1 = 0; // loc. in seq var ix1 = 0; // loc. in seq
var seq = undefined; var seq = undefined;
var msgs = [];
n2.on("input", function(msg) { n2.on("input", function(msg) {
try { try {
for (var i = 0; i < msgs.length; i++) {
msg.should.not.equal(msgs[i]);
}
msgs.push(msg);
if (seq === undefined) { if (seq === undefined) {
seq = results[ix0]; seq = results[ix0];
} }
@ -306,6 +311,19 @@ describe('BATCH node', function() {
check_concat(flow, results, inputs, done); check_concat(flow, results, inputs, done);
}); });
it('should concat same seq.', function(done) {
var flow = [{id:"n1", type:"batch", name: "BatchNode", mode: "concat", count: 0, overlap: 0, interval: 1, allowEmptySequence: false, topics: [{topic: "TA"}, {topic: "TA"}], wires:[["n2"]]},
{id:"n2", type:"helper"}];
var results = [
[9, 8, 9, 8]
];
var inputs = [
["TA", 9, 0, 2],
["TA", 8, 1, 2]
];
check_concat(flow, results, inputs, done);
});
it('should handle too many pending messages', function(done) { it('should handle too many pending messages', function(done) {
var flow = [{id:"n1", type:"batch", name: "BatchNode", mode: "concat", count: 0, overlap: 0, interval: 1, allowEmptySequence: false, topics: [{topic: "TA"}, {topic: "TB"}], wires:[["n2"]]}, var flow = [{id:"n1", type:"batch", name: "BatchNode", mode: "concat", count: 0, overlap: 0, interval: 1, allowEmptySequence: false, topics: [{topic: "TA"}, {topic: "TB"}], wires:[["n2"]]},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];