Summary of Changes:
- moved es install/start/stop logic into a seperate script - `grunt test` now runs the integration tests once for each version of ES we support - grunt can now install and run elasticearch (using grunt-run, pure js solution coming later) - included seperate es.sh script specifically for starting or stopping elasticsearch - url aliases, api, yaml_suite/index.js, and yaml_tests.json, are all now duplicated for 0_90 support - the client now accepts an apiVersion argument (undocumented) which defaults to 'master' but can be '0.90' - The yaml test runner will now check the name of the ES instance it is connecting to, preventing accidental wiping of ES
This commit is contained in:
@ -1,10 +1,20 @@
|
||||
var esOpts = [
|
||||
'-D es.network.host=localhost',
|
||||
'-D es.cluster.name=elasticsearch_js_test_runners',
|
||||
'-D es.node.name=elasticsearch_js_test_runner',
|
||||
'-D es.gateway.type=none',
|
||||
'-D es.index.store.type=memory',
|
||||
'-D es.discovery.zen.ping.multicast.enabled=false',
|
||||
'-D es.discovery.zen.ping_timeout=1',
|
||||
'-D es.logger.level=ERROR'
|
||||
].join(' ');
|
||||
|
||||
module.exports = {
|
||||
generate: {
|
||||
exec: 'node ./scripts/generate/index.js',
|
||||
options: {
|
||||
passArgs: [
|
||||
'verbose',
|
||||
'es_branch'
|
||||
'verbose'
|
||||
]
|
||||
}
|
||||
},
|
||||
@ -12,8 +22,7 @@ module.exports = {
|
||||
exec: 'node ./scripts/generate/index.js --no-api',
|
||||
options: {
|
||||
passArgs: [
|
||||
'verbose',
|
||||
'es_branch'
|
||||
'verbose'
|
||||
]
|
||||
}
|
||||
},
|
||||
@ -23,5 +32,31 @@ module.exports = {
|
||||
wait: false,
|
||||
ready: /listening/
|
||||
}
|
||||
},
|
||||
install_es_master: {
|
||||
exec: './scripts/es.sh install master',
|
||||
},
|
||||
es_master: {
|
||||
exec: './.snapshots/master_nightly/bin/elasticsearch ' + esOpts,
|
||||
options: {
|
||||
wait: false,
|
||||
quiet: true,
|
||||
onClose: function () {
|
||||
|
||||
},
|
||||
onReady: function () {
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
install_es_0_90: {
|
||||
exec: './scripts/es.sh install 0.90',
|
||||
},
|
||||
es_0_90: {
|
||||
exec: './.snapshots/0.90_nightly/bin/elasticsearch -f ' + esOpts,
|
||||
options: {
|
||||
wait: false,
|
||||
quiet: true
|
||||
}
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user