Merge branch 'master' of github.com:elasticsearch/elasticsearch-js into 1.5

This commit is contained in:
Spencer Alger
2014-02-07 13:41:12 -07:00

View File

@ -376,7 +376,7 @@ describe('Http Connector', function () {
var path = require('path'); var path = require('path');
var es = require('event-stream'); var es = require('event-stream');
var proc = cp.fork(path.join(__dirname, '../../fixtures/keepalive.js'), { var proc = cp.spawn('node', [path.join(__dirname, '../../fixtures/keepalive.js')], {
silent: true silent: true
}); });
@ -385,7 +385,7 @@ describe('Http Connector', function () {
proc.stderr proc.stderr
).pipe(es.wait(function (err, output) { ).pipe(es.wait(function (err, output) {
expect(err).to.eql(null); expect(err).to.eql(null);
expect(output.trim()).to.eql('1'); expect(parseInt(output.trim(), 10) <= 1).to.be.ok();
done(); done();
})); }));
}); });