github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Run server tests on port 9210

Browse source 
The UI tests were already running against a non-default port (ie 9200),
so there is already precedent for this.

Fixes #5529
This commit is contained in:
Court Ewing 2015-11-30 16:25:42 -05:00
parent c18d48323b
commit af6175e81a
7 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/plugins/elasticsearch/lib/__tests__/check_es_version.js
View file

@ -22,7 +22,8 @@ describe('plugins/elasticsearch', function () {
},
status: {
red: sinon.stub()
}
},
url: 'http://localhost:9210'
}
}
};

10
src/plugins/elasticsearch/lib/__tests__/health_check.js
View file

@ -39,7 +39,7 @@ describe('plugins/elasticsearch', function () {
nodes: {
'node-01': {
version: '1.5.0',
http_address: 'inet[/127.0.0.1:9200]',
http_address: 'inet[/127.0.0.1:9210]',
ip: '127.0.0.1'
}
}
@ -73,7 +73,7 @@ describe('plugins/elasticsearch', function () {
it('should set the cluster red if the ping fails, then to green', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.onCall(0).returns(Promise.reject(new NoConnections()));
@ -85,7 +85,7 @@ describe('plugins/elasticsearch', function () {
expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
sinon.assert.calledOnce(plugin.status.red);
expect(plugin.status.red.args[0][0]).to.be(
'Unable to connect to Elasticsearch at http://localhost:9200. Retrying in 2.5 seconds.'
'Unable to connect to Elasticsearch at http://localhost:9210. Retrying in 2.5 seconds.'
);
sinon.assert.calledTwice(client.ping);
sinon.assert.calledOnce(client.nodes.info);
@ -97,7 +97,7 @@ describe('plugins/elasticsearch', function () {
});
it('should set the cluster red if the health check status is red, then to green', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.returns(Promise.resolve());
@ -120,7 +120,7 @@ describe('plugins/elasticsearch', function () {
});
it('should set the cluster yellow if the health check timed_out and create index', function () {
get.withArgs('elasticsearch.url').returns('http://localhost:9200');
get.withArgs('elasticsearch.url').returns('http://localhost:9210');
get.withArgs('elasticsearch.minimumVersion').returns('1.4.4');
get.withArgs('kibana.index').returns('.my-kibana');
client.ping.returns(Promise.resolve());

3
src/plugins/elasticsearch/lib/__tests__/routes.js
View file

@ -27,6 +27,9 @@ describe('plugins/elasticsearch', function () {
},
optimize: {
enabled: false
},
elasticsearch: {
url: 'http://localhost:9210'
}
});

5
src/plugins/elasticsearch/lib/__tests__/validate.js
View file

@ -17,7 +17,10 @@ describe('plugins/elasticsearch', function () {
server: { autoListen: false },
plugins: { scanDirs: [ fromRoot('src/plugins') ] },
logging: { quiet: true },
optimize: { enabled: false }
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
return kbnServer.ready()

3
src/server/__tests__/basePath.js
View file

@ -18,6 +18,9 @@ describe('Server basePath config', function () {
plugins: { scanDirs: [src('plugins')] },
logging: { quiet: true },
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
await kbnServer.ready();
return kbnServer;

3
src/server/http/__tests__/xsrf.js
View file

@ -23,6 +23,9 @@ describe('xsrf request filter', function () {
plugins: { scanDirs: [src('plugins')] },
logging: { quiet: true },
optimize: { enabled: false },
elasticsearch: {
url: 'http://localhost:9210'
}
});
await kbnServer.ready();

7
tasks/config/esvm.js
View file

@ -35,7 +35,12 @@ module.exports = function (grunt) {
test: {
options: {
directory: resolve(directory, 'test'),
purge: true
purge: true,
config: {
http: {
port: 9210
}
}
}
},
ui: {