Skip to content

Commit f65f352

Browse files
dgieselaardgieselaar
committed
[APM] Always load esarchives from common
Instead of requiring every test suite to store its archives under {suite}/fixtures/es_archiver, always load them from common/fixtures/es_archiver.
1 parent f56fcb3 commit f65f352

15 files changed

Lines changed: 5 additions & 89054 deletions

File tree

‎x-pack/test/apm_api_integration/common/config.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
88
import supertestAsPromised from 'supertest-as-promised';
99
import { format, UrlObject } from 'url';
10+
import path from 'path';
1011
import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
1112
import { PromiseReturnType } from '../../../plugins/apm/typings/common';
1213
import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
@@ -33,7 +34,7 @@ const supertestAsApmUser = (kibanaServer: UrlObject, apmUser: ApmUser) => async
3334
return supertestAsPromised(url);
3435
};
3536

36-
export function createTestConfig<T extends Settings>(settings: T) {
37+
export function createTestConfig(settings: Settings) {
3738
const { testFiles, license, name } = settings;
3839

3940
return async ({ readConfigFile }: FtrConfigProviderContext) => {
@@ -49,6 +50,9 @@ export function createTestConfig<T extends Settings>(settings: T) {
4950
return {
5051
testFiles,
5152
servers,
53+
esArchiver: {
54+
directory: path.resolve(__dirname, './fixtures/es_archiver'),
55+
},
5256
services: {
5357
...services,
5458
supertest: supertestAsApmReadUser,

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/8.0.0/data.json.gz renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/8.0.0/data.json.gz

File renamed without changes.

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/8.0.0/mappings.json renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/8.0.0/mappings.json

File renamed without changes.

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/apm_8.0.0/data.json.gz renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz

File renamed without changes.

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/apm_8.0.0/mappings.json renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json

File renamed without changes.

x-pack/test/apm_api_integration/trial/fixtures/es_archiver/ml_8.0.0/data.json.gz renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/data.json.gz

File renamed without changes.

x-pack/test/apm_api_integration/trial/fixtures/es_archiver/ml_8.0.0/mappings.json renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/ml_8.0.0/mappings.json

File renamed without changes.

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/observability_overview/data.json.gz renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/observability_overview/data.json.gz

File renamed without changes.

x-pack/test/apm_api_integration/basic/fixtures/es_archiver/observability_overview/mappings.json renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/observability_overview/mappings.json

File renamed without changes.

x-pack/test/apm_api_integration/trial/fixtures/es_archiver/rum_8.0.0/data.json.gz renamed to x-pack/test/apm_api_integration/common/fixtures/es_archiver/rum_8.0.0/data.json.gz

File renamed without changes.

0 commit comments

Comments
 (0)