maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

x-pack tests should use servers from other config files already loaded (#22739) (#22762)

Browse source 
* x-pack tests should use servers from other config files already loaded

* Fix es_test_config that was using TEST_KIBANA_USERNAME/PASSWORD
This commit is contained in:
Lee Drengenberg 2018-09-06 11:32:12 -05:00 committed by GitHub
parent 263c9169bc
commit b2441c02fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/kbn-test/src/es/es_test_config.js
View file

@ -53,8 +53,9 @@ export const esTestConfig = new class EsTestConfig {
};
}
const username = process.env.TEST_KIBANA_USERNAME || adminTestUser.username;
const password = process.env.TEST_KIBANA_PASSWORD || adminTestUser.password;
const username = process.env.TEST_ES_USERNAME || adminTestUser.username;
const password = process.env.TEST_ES_PASSWORD || adminTestUser.password;
return {
// Allow setting any individual component(s) of the URL,
// or use default values (username and password from ../kbn/users.js)

24
x-pack/test/functional/config.js
View file

@ -7,7 +7,6 @@
/* eslint-disable kibana-custom/no-default-export */
import { resolve } from 'path';
import { format as formatUrl } from 'url';
import {
SecurityPageProvider,
@ -57,25 +56,6 @@ export default async function ({ readConfigFile }) {
const kibanaFunctionalConfig = await readConfigFile(require.resolve('../../../test/functional/config.js'));
const kibanaAPITestsConfig = await readConfigFile(require.resolve('../../../test/api_integration/config.js'));
const servers = {
elasticsearch: {
protocol: process.env.TEST_ES_PROTOCOL || 'http',
hostname: process.env.TEST_ES_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_ES_PORT, 10) || 9240,
auth: 'elastic:changeme',
username: 'elastic',
password: 'changeme',
},
kibana: {
protocol: process.env.TEST_KIBANA_PROTOCOL || 'http',
hostname: process.env.TEST_KIBANA_HOSTNAME || 'localhost',
port: parseInt(process.env.TEST_KIBANA_PORT, 10) || 5640,
auth: 'elastic:changeme',
username: 'elastic',
password: 'changeme',
},
};
return {
// list paths to the files that contain your plugins tests
testFiles: [
@ -135,7 +115,7 @@ export default async function ({ readConfigFile }) {
reporting: ReportingPageProvider,
},
servers,
servers: kibanaFunctionalConfig.get('servers'),
esTestCluster: {
license: 'trial',
@ -151,8 +131,6 @@ export default async function ({ readConfigFile }) {
serverArgs: [
...kibanaCommonConfig.get('kbnTestServer.serverArgs'),
'--server.uuid=5b2de169-2785-441b-ae8c-186a1936b17d',
`--server.port=${servers.kibana.port}`,
`--elasticsearch.url=${formatUrl(servers.elasticsearch)}`,
'--xpack.xpack_main.telemetry.enabled=false',
'--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"', // server restarts should not invalidate active sessions
],