Skip to content

Commit

Permalink
[APM] Always load esarchives from common
Browse files Browse the repository at this point in the history
Instead of requiring every test suite to store its archives under {suite}/fixtures/es_archiver, always load them from common/fixtures/es_archiver.
  • Loading branch information
dgieselaar committed Sep 10, 2020
1 parent f56fcb3 commit f65f352
Show file tree
Hide file tree
Showing 15 changed files with 5 additions and 89,054 deletions.
6 changes: 5 additions & 1 deletion x-pack/test/apm_api_integration/common/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
import supertestAsPromised from 'supertest-as-promised';
import { format, UrlObject } from 'url';
import path from 'path';
import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
import { PromiseReturnType } from '../../../plugins/apm/typings/common';
import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
Expand All @@ -33,7 +34,7 @@ const supertestAsApmUser = (kibanaServer: UrlObject, apmUser: ApmUser) => async
return supertestAsPromised(url);
};

export function createTestConfig<T extends Settings>(settings: T) {
export function createTestConfig(settings: Settings) {
const { testFiles, license, name } = settings;

return async ({ readConfigFile }: FtrConfigProviderContext) => {
Expand All @@ -49,6 +50,9 @@ export function createTestConfig<T extends Settings>(settings: T) {
return {
testFiles,
servers,
esArchiver: {
directory: path.resolve(__dirname, './fixtures/es_archiver'),
},
services: {
...services,
supertest: supertestAsApmReadUser,
Expand Down
Binary file not shown.
Loading

0 comments on commit f65f352

Please sign in to comment.