mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
[APM] Catch cleanup errors in API tests (#168184)
This commit is contained in:
parent
000b70c000
commit
932d5d78a1
4 changed files with 37 additions and 13 deletions
|
@ -17,10 +17,10 @@ import { waitForRuleStatus } from './helpers/wait_for_rule_status';
|
|||
|
||||
export default function ApiTest({ getService }: FtrProviderContext) {
|
||||
const registry = getService('registry');
|
||||
|
||||
const supertest = getService('supertest');
|
||||
const ml = getService('ml');
|
||||
const es = getService('es');
|
||||
const logger = getService('log');
|
||||
|
||||
const synthtraceEsClient = getService('synthtraceEsClient');
|
||||
// FLAKY https://github.com/elastic/kibana/issues/160298
|
||||
|
@ -68,8 +68,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await synthtraceEsClient.clean();
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
try {
|
||||
await synthtraceEsClient.clean();
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
} catch (e) {
|
||||
logger.info('Could not delete rule by id', e);
|
||||
}
|
||||
});
|
||||
|
||||
describe('with ml jobs', () => {
|
||||
|
|
|
@ -289,8 +289,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
try {
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
} catch (e) {
|
||||
logger.info('Could not delete rule', e);
|
||||
}
|
||||
});
|
||||
|
||||
it('produces one alert for the opbeans-php service', async () => {
|
||||
|
|
|
@ -77,8 +77,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await synthtraceEsClient.clean();
|
||||
await clearKibanaApmEventLog(es);
|
||||
try {
|
||||
await synthtraceEsClient.clean();
|
||||
await clearKibanaApmEventLog(es);
|
||||
} catch (e) {
|
||||
logger.info('Could not clear apm event log', e);
|
||||
}
|
||||
});
|
||||
|
||||
describe('create rule for opbeans-java without kql filter', () => {
|
||||
|
@ -229,8 +233,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
try {
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
} catch (e) {
|
||||
logger.info('Could not delete rule or action connector', e);
|
||||
}
|
||||
});
|
||||
|
||||
it('checks if rule is active', async () => {
|
||||
|
|
|
@ -76,8 +76,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await synthtraceEsClient.clean();
|
||||
await clearKibanaApmEventLog(es);
|
||||
try {
|
||||
await synthtraceEsClient.clean();
|
||||
await clearKibanaApmEventLog(es);
|
||||
} catch (e) {
|
||||
logger.info('Could not clean up apm event log', e);
|
||||
}
|
||||
});
|
||||
|
||||
describe('create rule without kql query', () => {
|
||||
|
@ -250,8 +254,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
after(async () => {
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
try {
|
||||
await deleteRuleById({ supertest, ruleId });
|
||||
await deleteAlertsByRuleId({ es, ruleId });
|
||||
} catch (e) {
|
||||
logger.info('Could not delete rule', e);
|
||||
}
|
||||
});
|
||||
|
||||
it('indexes alert document with all group-by fields', async () => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue