Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LeeDr merged 1 commit into from
Sep 6, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/kbn-test/src/es/es_test_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 1 addition & 23 deletions x-pack/test/functional/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
/* eslint-disable kibana-custom/no-default-export */

import { resolve } from 'path';
import { format as formatUrl } from 'url';

import {
SecurityPageProvider,
Expand Down Expand Up @@ -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: [
Expand Down Expand Up @@ -135,7 +115,7 @@ export default async function ({ readConfigFile }) {
reporting: ReportingPageProvider,
},

servers,
servers: kibanaFunctionalConfig.get('servers'),

esTestCluster: {
license: 'trial',
Expand All @@ -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
],
Expand Down