From 43683afa00a1dc2c18668bdb96920f768580c03e Mon Sep 17 00:00:00 2001 From: Mike Cote Date: Mon, 16 Nov 2020 16:36:03 -0500 Subject: [PATCH] Scenario to test timeout --- .../alerts/server/alert_type_registry.ts | 1 + .../plugins/alerts/server/alert_types.ts | 5 +++- .../security_and_spaces/scenarios.ts | 24 +++++++++---------- .../tests/alerting/create.ts | 5 ++-- .../security_and_spaces/tests/index.ts | 8 +++---- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/x-pack/plugins/alerts/server/alert_type_registry.ts b/x-pack/plugins/alerts/server/alert_type_registry.ts index 8fe2ab06acd9a..c5063554c872e 100644 --- a/x-pack/plugins/alerts/server/alert_type_registry.ts +++ b/x-pack/plugins/alerts/server/alert_type_registry.ts @@ -92,6 +92,7 @@ export class AlertTypeRegistry { this.taskManager.registerTaskDefinitions({ [`alerting:${alertType.id}`]: { title: alertType.name, + timeout: '10s', createTaskRunner: (context: RunContext) => this.taskRunnerFactory.create({ ...alertType } as AlertType, context), }, diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts index 7ed864afac4cc..35eacad62f801 100644 --- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts +++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts @@ -398,7 +398,10 @@ export function defineAlertTypes( actionGroups: [{ id: 'default', name: 'Default' }], producer: 'alertsFixture', defaultActionGroupId: 'default', - async executor() {}, + async executor() { + console.log('Running', new Date().toISOString()); + await new Promise(resolve => setTimeout(resolve, 30000)); + }, }; const onlyContextVariablesAlertType: AlertType = { id: 'test.onlyContextVariables', diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts b/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts index 65e75f33072c3..919c7ae9b998b 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/scenarios.ts @@ -245,19 +245,19 @@ const Space1AllAtSpace2: Space1AllAtSpace2 = { }; export const UserAtSpaceScenarios: [ - NoKibanaPrivilegesAtSpace1, + // NoKibanaPrivilegesAtSpace1, SuperuserAtSpace1, - GlobalReadAtSpace1, - Space1AllAtSpace1, - Space1AllAtSpace2, - Space1AllWithRestrictedFixtureAtSpace1, - Space1AllAlertingNoneActionsAtSpace1 + // GlobalReadAtSpace1, + // Space1AllAtSpace1, + // Space1AllAtSpace2, + // Space1AllWithRestrictedFixtureAtSpace1, + // Space1AllAlertingNoneActionsAtSpace1 ] = [ - NoKibanaPrivilegesAtSpace1, + // NoKibanaPrivilegesAtSpace1, SuperuserAtSpace1, - GlobalReadAtSpace1, - Space1AllAtSpace1, - Space1AllAtSpace2, - Space1AllWithRestrictedFixtureAtSpace1, - Space1AllAlertingNoneActionsAtSpace1, + // GlobalReadAtSpace1, + // Space1AllAtSpace1, + // Space1AllAtSpace2, + // Space1AllWithRestrictedFixtureAtSpace1, + // Space1AllAlertingNoneActionsAtSpace1, ]; diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts index 19d90378e8b7a..7459e343b7216 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts @@ -25,7 +25,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { describe('create', () => { const objectRemover = new ObjectRemover(supertest); - after(() => objectRemover.removeAll()); + // after(() => objectRemover.removeAll()); async function getScheduledTask(id: string) { return await es.get({ @@ -37,7 +37,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { for (const scenario of UserAtSpaceScenarios) { const { user, space } = scenario; describe(scenario.id, () => { - it('should handle create alert request appropriately', async () => { + it.only('should handle create alert request appropriately', async () => { const { body: createdAction } = await supertest .post(`${getUrlPrefix(space.id)}/api/actions/action`) .set('kbn-xsrf', 'foo') @@ -55,6 +55,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { .auth(user.username, user.password) .send( getTestAlertData({ + schedule: { interval: '10s' }, actions: [ { id: createdAction.id, diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts index 7daa223dc2d43..262089c324f85 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts @@ -65,11 +65,11 @@ export default function alertingApiIntegrationTests({ await setupSpacesAndUsers(spacesService, securityService); }); - after(async () => { - await tearDownUsers(securityService); + // after(async () => { + // await tearDownUsers(securityService); - await esArchiver.unload('empty_kibana'); - }); + // await esArchiver.unload('empty_kibana'); + // }); loadTestFile(require.resolve('./actions')); loadTestFile(require.resolve('./alerting'));