mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
Use esvm to start and stop elasticsearch for all tests that need it
This commit is contained in:
parent
327f5898a7
commit
03e109f753
5 changed files with 1 additions and 46 deletions
|
@ -1,42 +0,0 @@
|
|||
var portscanner = require('portscanner');
|
||||
var path = require('path');
|
||||
var Promise = require('bluebird');
|
||||
var libesvm = require('libesvm');
|
||||
var fromRoot = require('requirefrom')('src/utils')('fromRoot');
|
||||
|
||||
function startEs() {
|
||||
var options = {
|
||||
branch: 'master',
|
||||
directory: fromRoot('esvm/test-es'),
|
||||
purge: true,
|
||||
config: {
|
||||
'cluster.name': 'test',
|
||||
'network.host': '127.0.0.1'
|
||||
}
|
||||
};
|
||||
var cluster = libesvm.createCluster(options);
|
||||
return cluster.install().then(function () {
|
||||
return cluster.start();
|
||||
}).then(function () {
|
||||
after(function () {
|
||||
this.timeout(120000);
|
||||
return cluster.shutdown();
|
||||
});
|
||||
return cluster;
|
||||
});
|
||||
}
|
||||
|
||||
function maybeStartES() {
|
||||
return new Promise(function (resolve, reject) {
|
||||
portscanner.checkPortStatus(9200, '127.0.0.1', function (err, status) {
|
||||
if (err) return reject(err);
|
||||
if (status === 'closed') return startEs().then(resolve, reject);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = function () {
|
||||
this.timeout(120000);
|
||||
return maybeStartES();
|
||||
};
|
|
@ -8,7 +8,6 @@ var fromRoot = src('utils/fromRoot');
|
|||
|
||||
describe('plugins/elasticsearch', function () {
|
||||
describe('routes', function () {
|
||||
before(require('./_ensure_elasticsearch'));
|
||||
|
||||
var kbnServer;
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ module.exports = function (grunt) {
|
|||
let { compact } = require('lodash');
|
||||
|
||||
grunt.registerTask('jenkins', 'Jenkins build script', compact([
|
||||
'esvm:dev',
|
||||
'test',
|
||||
process.env.JOB_NAME === 'kibana_core' ? 'build' : null
|
||||
]));
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var _ = require('lodash');
|
||||
module.exports = function (grunt) {
|
||||
grunt.registerTask('test:server', [ 'simplemocha:all' ]);
|
||||
grunt.registerTask('test:server', [ 'esvm:dev', 'simplemocha:all', 'esvm_shutdown:dev' ]);
|
||||
grunt.registerTask('test:browser', [ 'run:testServer', 'karma:unit' ]);
|
||||
grunt.registerTask('test:coverage', [ 'run:testCoverageServer', 'karma:coverage' ]);
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
module.exports = function (grunt) {
|
||||
|
||||
grunt.registerTask('travis', 'Travis CI build script', [
|
||||
'esvm:dev',
|
||||
'test'
|
||||
]);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue