habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevented undefined from getting passed to path.join in the yaml test runner

Browse Source
This commit is contained in:
Spencer Alger
2013-10-24 10:47:21 -07:00
parent cc1509cef3
commit 6ae5c30b2e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/yaml_suite/index.js
View File

@ -9,7 +9,7 @@ var path = require('path'),
Minimatch = require('minimatch').Minimatch; Minimatch = require('minimatch').Minimatch;
var argv = require('optimist') var argv = require('optimist')
.default('executable', path.join(process.env.ES_HOME, './bin/elasticsearch')) .default('executable', process.env.ES_HOME ? path.join(process.env.ES_HOME, './bin/elasticsearch') : null)
.default('clusterName', 'yaml-test-runner') .default('clusterName', 'yaml-test-runner')
.default('dataPath', '/tmp/yaml-test-runner') .default('dataPath', '/tmp/yaml-test-runner')
.default('hostname', 'localhost') .default('hostname', 'localhost')

5
test/integration/yaml_suite/server.js
View File

@ -6,8 +6,9 @@ var childProc = require('child_process'),
exports.start = function (params, cb) { exports.start = function (params, cb) {
if (!fs.existsSync(params.executable)) { if (!params.executable || !fs.existsSync(params.executable)) {
return cb(new Error('unable to find elasticsearch executable')); return cb(new Error('unable to find elasticsearch executable, ' +
'set ES_HOME env var to the instalation path of elasticsearch'));
} }
var server = childProc.spawn( var server = childProc.spawn(