consolidate functional test config

elastic · Dec 10, 2019 · dd5fa50 · dd5fa50
1 parent a966a0e
commit dd5fa50
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 115 deletions.
diff --git a/x-pack/test/reporting/configs/api.js b/x-pack/test/reporting/configs/api.js
diff --git a/x-pack/test/reporting/configs/chromium_api.js b/x-pack/test/reporting/configs/chromium_api.js
@@ -4,26 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getReportingApiConfig } from './api';
+import * as path from 'path';
+import { ReportingAPIProvider } from '../services';
 
 export default async function ({ readConfigFile }) {
-
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
 
   return {
-    ...reportingApiConfig,
-    junit: {
-      reportName: 'X-Pack Chromium API Reporting Tests',
-    },
+    servers: apiConfig.get('servers'),
+    junit: { reportName: 'X-Pack Chromium API Reporting Tests' },
     testFiles: [require.resolve('../api/chromium_tests')],
+    services: {
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
+    },
     kbnTestServer: {
-      ...reportingApiConfig.kbnTestServer,
+      ...apiConfig.get('kbnTestServer'),
       serverArgs: [
-        ...reportingApiConfig.kbnTestServer.serverArgs,
+        ...apiConfig.get('kbnTestServer.serverArgs'),
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
+        `--xpack.reporting.queue.pollInterval=3000`,
         `--xpack.spaces.enabled=false`,
       ],
     },
+    esArchiver: {
+      directory: path.resolve(__dirname, '../es_archives')
+    },
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }
diff --git a/x-pack/test/reporting/configs/chromium_functional.js b/x-pack/test/reporting/configs/chromium_functional.js
@@ -4,24 +4,31 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getFunctionalConfig } from './functional';
+import * as path from 'path';
 
 export default async function ({ readConfigFile }) {
-
-  const functionalConfig = await getFunctionalConfig({ readConfigFile });
+  const xPackFunctionalTestsConfig = await readConfigFile(require.resolve('../../functional/config.js'));
 
   return {
-    ...functionalConfig,
+    services: xPackFunctionalTestsConfig.get('services'),
+    pageObjects: xPackFunctionalTestsConfig.get('pageObjects'),
+    servers: xPackFunctionalTestsConfig.get('servers'),
+    esTestCluster: xPackFunctionalTestsConfig.get('esTestCluster'),
+    apps: xPackFunctionalTestsConfig.get('apps'),
+    esArchiver: {
+      directory: path.resolve(__dirname, '../es_archives')
+    },
+    screenshots: xPackFunctionalTestsConfig.get('screenshots'),
     junit: {
       reportName: 'X-Pack Chromium Functional Reporting Tests',
     },
     testFiles: [require.resolve('../functional')],
     kbnTestServer: {
-      ...functionalConfig.kbnTestServer,
+      ...xPackFunctionalTestsConfig.get('kbnTestServer'),
       serverArgs: [
-        ...functionalConfig.kbnTestServer.serverArgs,
+        ...xPackFunctionalTestsConfig.get('kbnTestServer.serverArgs'),
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
+        '--logging.events.log', JSON.stringify(['info', 'warning', 'error', 'fatal', 'optimize', 'reporting'])
       ],
     },
   };

diff --git a/x-pack/test/reporting/configs/functional.js b/x-pack/test/reporting/configs/functional.js
diff --git a/x-pack/test/reporting/configs/generate_api.js b/x-pack/test/reporting/configs/generate_api.js
@@ -4,44 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
-import { format as formatUrl } from 'url';
-import { getApiIntegrationConfig } from '../../api_integration/config';
-import { getReportingApiConfig } from './api';
+import { ReportingAPIProvider } from '../services';
 
 export default async function ({ readConfigFile }) {
-  const servers = {
-    kibana: kbnTestConfig.getUrlParts(),
-    elasticsearch: esTestConfig.getUrlParts(),
-  };
-
-  const apiTestConfig = await getApiIntegrationConfig({ readConfigFile });
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
   const xPackFunctionalTestsConfig = await readConfigFile(require.resolve('../../functional/config.js'));
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
 
   return {
-    ...reportingApiConfig,
+    servers: apiConfig.get('servers'),
     junit: { reportName: 'X-Pack Reporting Generate API Integration Tests' },
     testFiles: [require.resolve('../api/generate')],
     services: {
-      ...apiTestConfig.services,
-      ...reportingApiConfig.services,
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
     },
     kbnTestServer: {
+      ...apiConfig.get('kbnTestServer'),
       ...xPackFunctionalTestsConfig.get('kbnTestServer'),
       serverArgs: [
+        ...apiConfig.get('kbnTestServer.serverArgs'),
         `--optimize.enabled=false`,
-        `--logging.json=false`,
         `--server.maxPayloadBytes=1679958`,
-        `--server.port=${kbnTestConfig.getPort()}`,
-        `--elasticsearch.hosts=${formatUrl(servers.elasticsearch)}`,
-        `--elasticsearch.username=${kibanaServerTestUser.username}`,
-        `--elasticsearch.password=${kibanaServerTestUser.password}`,
-        `--xpack.reporting.csv.enablePanelActionDownload=true`,
         `--xpack.reporting.csv.maxSizeBytes=2850`,
         `--xpack.reporting.queue.pollInterval=3000`,
+        `--xpack.spaces.enabled=false`,
       ],
     },
-    esArchiver: apiTestConfig.esArchiver,
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }