diff --git a/.travis.yml b/.travis.yml index b76243778..34536cef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ matrix: allow_failures: - node_js: "5" - node_js: "6" -before_install: - - npm install -g npm@latest-2 node_js: - "6" - "5" diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/core/75-exec_spec.js index 44f570af2..a564c306c 100644 --- a/test/nodes/core/core/75-exec_spec.js +++ b/test/nodes/core/core/75-exec_spec.js @@ -123,7 +123,6 @@ describe('exec node', function() { // arg3(error,stdout,stderr); arg3("error",new Buffer([0x01,0x02,0x03,0x88])); }); - helper.load(execNode, flow, function() { var n1 = helper.getNode("n1"); var n2 = helper.getNode("n2"); @@ -159,9 +158,10 @@ describe('exec node', function() { var logEvents = helper.log().args.filter(function(evt) { return evt[0].type == "exec"; }); - logEvents.should.have.length(1); - logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.toString().should.startWith("Exec node timeout"); + var i = logEvents.length - 1; + //logEvents.should.have.length(1); + logEvents[i][0].should.have.a.property('msg'); + logEvents[i][0].msg.toString().should.startWith("Exec node timeout"); done(); },400); n1.receive({}); @@ -298,7 +298,6 @@ 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"); @@ -312,9 +311,9 @@ describe('exec node', function() { var logEvents = helper.log().args.filter(function(evt) { return evt[0].type == "exec"; }); - logEvents.should.have.length(1); - logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.toString().should.startWith("Exec node timeout"); + var i = logEvents.length - 1; + logEvents[i][0].should.have.a.property('msg'); + logEvents[i][0].msg.toString().should.startWith("Exec node timeout"); done(); },400); n1.receive({}); diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index 43b9904a6..80984eff7 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/test/nodes/core/parsers/70-JSON_spec.js @@ -97,7 +97,8 @@ describe('JSON node', function() { return evt[0].type == "json"; }); logEvents.should.have.length(1); - logEvents[0][0].should.have.a.property('msg',"Unexpected token o"); + logEvents[0][0].should.have.a.property('msg'); + logEvents[0][0].msg.should.startWith("Unexpected token o"); logEvents[0][0].should.have.a.property('level',helper.log().ERROR); done(); } catch(err) {