Fixing flaky disable test (#142687)

* Unskipping test * Adding retries * Cleanup * Cleanup
elastic · Oct 5, 2022 · 34deabc · 34deabc
1 parent 57876a8
commit 34deabc
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
@@ -26,8 +26,7 @@ export default function createDisableRuleTests({ getService }: FtrProviderContex
   const retry = getService('retry');
   const supertest = getService('supertest');
 
-  // Failing: See https://github.com/elastic/kibana/issues/141864
-  describe.skip('disable', () => {
+  describe('disable', () => {
     const objectRemover = new ObjectRemover(supertestWithoutAuth);
     const ruleUtils = new RuleUtils({ space: Spaces.space1, supertestWithoutAuth });
 
@@ -52,15 +51,17 @@ export default function createDisableRuleTests({ getService }: FtrProviderContex
       await ruleUtils.disable(createdRule.id);
 
       // task doc should still exist but be disabled
-      const taskRecord = await getScheduledTask(createdRule.scheduled_task_id);
-      expect(taskRecord.type).to.eql('task');
-      expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
-      expect(JSON.parse(taskRecord.task.params)).to.eql({
-        alertId: createdRule.id,
-        spaceId: Spaces.space1.id,
-        consumer: 'alertsFixture',
+      await retry.try(async () => {
+        const taskRecord = await getScheduledTask(createdRule.scheduled_task_id);
+        expect(taskRecord.type).to.eql('task');
+        expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
+        expect(JSON.parse(taskRecord.task.params)).to.eql({
+          alertId: createdRule.id,
+          spaceId: Spaces.space1.id,
+          consumer: 'alertsFixture',
+        });
+        expect(taskRecord.task.enabled).to.eql(false);
       });
-      expect(taskRecord.task.enabled).to.eql(false);
 
       // Ensure AAD isn't broken
       await checkAAD({
@@ -196,15 +197,17 @@ export default function createDisableRuleTests({ getService }: FtrProviderContex
           .expect(204);
 
         // task doc should still exist but be disabled
-        const taskRecord = await getScheduledTask(createdRule.scheduled_task_id);
-        expect(taskRecord.type).to.eql('task');
-        expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
-        expect(JSON.parse(taskRecord.task.params)).to.eql({
-          alertId: createdRule.id,
-          spaceId: Spaces.space1.id,
-          consumer: 'alertsFixture',
+        await retry.try(async () => {
+          const taskRecord = await getScheduledTask(createdRule.scheduled_task_id);
+          expect(taskRecord.type).to.eql('task');
+          expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
+          expect(JSON.parse(taskRecord.task.params)).to.eql({
+            alertId: createdRule.id,
+            spaceId: Spaces.space1.id,
+            consumer: 'alertsFixture',
+          });
+          expect(taskRecord.task.enabled).to.eql(false);
         });
-        expect(taskRecord.task.enabled).to.eql(false);
 
         // Ensure AAD isn't broken
         await checkAAD({