Merge pull request #4916 from Bargs/esvmForAllTests

Use esvm to start and stop elasticsearch for all tests that need it

src/plugins/elasticsearch/lib/__tests__/_ensure_elasticsearch.js

@@ -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();
-};

src/plugins/elasticsearch/lib/__tests__/routes.js

@@ -8,7 +8,6 @@ var fromRoot = src('utils/fromRoot');
 
 describe('plugins/elasticsearch', function () {
   describe('routes', function () {
-    before(require('./_ensure_elasticsearch'));
 
     var kbnServer;
 

tasks/config/esvm.js

@@ -5,13 +5,9 @@ module.exports = function (grunt) {
 
   return {
     options: {
-      directory: directory,
       branch: '2.0',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
-        path: {
-          data: dataDir
-        },
         network: {
           host: '127.0.0.1'
         },
@@ -22,6 +18,21 @@ module.exports = function (grunt) {
         }
       }
     },
-    dev: {}
+    dev: {
+      options: {
+        directory: resolve(directory, 'dev'),
+        config: {
+          path: {
+            data: dataDir
+          }
+        }
+      }
+    },
+    test: {
+      options: {
+        directory: resolve(directory, 'test'),
+        purge: true
+      }
+    }
   };
 };

tasks/jenkins.js

@@ -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
   ]));

tasks/test.js

@@ -1,6 +1,6 @@
 var _ = require('lodash');
 module.exports = function (grunt) {
-  grunt.registerTask('test:server', [ 'simplemocha:all' ]);
+  grunt.registerTask('test:server', [ 'esvm:test', 'simplemocha:all', 'esvm_shutdown:test' ]);
   grunt.registerTask('test:browser', [ 'run:testServer', 'karma:unit' ]);
   grunt.registerTask('test:coverage', [ 'run:testCoverageServer', 'karma:coverage' ]);
 

tasks/travis.js

@@ -1,7 +1,6 @@
 module.exports = function (grunt) {
 
   grunt.registerTask('travis', 'Travis CI build script', [
-    'esvm:dev',
     'test'
   ]);