github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix setup error during test (#120917) (#121029)

Browse source 
Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2021-12-10 04:16:00 -05:00 • committed by GitHub
parent 23d22569de
commit 43bf13d2ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/server/saved_objects/migrations/integration_tests/7_13_0_failed_action_tasks.test.ts
View file

@ -19,8 +19,7 @@ async function removeLogFile() {
await fs.unlink(logFilePath).catch(() => void 0);
}
// FLAKY: https://github.com/elastic/kibana/issues/118626
describe.skip('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
describe('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
let esServer: kbnTestServer.TestElasticsearchUtils;
let root: Root;
let startES: () => Promise<kbnTestServer.TestElasticsearchUtils>;

2
x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts
View file

@ -341,7 +341,7 @@ export async function ensureDefaultComponentTemplate(
await putComponentTemplate(esClient, logger, {
name: FLEET_GLOBAL_COMPONENT_TEMPLATE_NAME,
body: FLEET_GLOBAL_COMPONENT_TEMPLATE_CONTENT,
});
}).clusterPromise;
}
return { isCreated: !existingTemplate };