x-pack tests should use servers from other config files already loaded (

elastic#22739) * x-pack tests should use servers from other config files already loaded * Fix es_test_config that was using TEST_KIBANA_USERNAME/PASSWORD
LeeDr · Sep 6, 2018 · 27d41bf · 27d41bf
1 parent 69dce7b
commit 27d41bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/packages/kbn-test/src/es/es_test_config.js b/packages/kbn-test/src/es/es_test_config.js
@@ -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)

diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
@@ -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
  ],