Adding delay between creating and updating alert to avoid 409 conflicts

elastic · Dec 1, 2020 · f87434b · f87434b
1 parent d8643f7
commit f87434b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts
@@ -301,6 +301,9 @@ export default function createDeleteTests({ getService }: FtrProviderContext) {
             .send(getTestAlertData())
             .expect(200);
 
+          // Delay before performing update to avoid 409 errors
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+
           await supertest
             .put(
               `${getUrlPrefix(space.id)}/api/alerts_fixture/saved_object/alert/${createdAlert.id}`

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
@@ -287,6 +287,9 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
             .expect(200);
           objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts');
 
+          // Delay before performing update to avoid 409 errors
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+
           await supertest
             .put(
               `${getUrlPrefix(space.id)}/api/alerts_fixture/saved_object/alert/${createdAlert.id}`

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
@@ -304,6 +304,9 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
             .expect(200);
           objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts');
 
+          // Delay before performing update to avoid 409 errors
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+
           await supertest
             .put(
               `${getUrlPrefix(space.id)}/api/alerts_fixture/saved_object/alert/${createdAlert.id}`

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
@@ -37,6 +37,9 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
       const alertId = response.body.id;
       objectRemover.add(spaceId, alertId, 'alert', 'alerts');
 
+      // Delay before performing update to avoid 409 errors
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       // break AAD
       await supertest
         .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${alertId}`)

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts
@@ -37,6 +37,9 @@ export default function executionStatusAlertTests({ getService }: FtrProviderCon
 
       let executionStatus = await waitForStatus(alertId, new Set(['ok']), 10000);
 
+      // Delay before performing update to avoid 409 errors
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       // break AAD
       await supertest
         .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${alertId}`)

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
@@ -429,6 +429,9 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             .expect(200);
           objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts');
 
+          // Delay before performing update to avoid 409 errors
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+
           await supertest
             .put(
               `${getUrlPrefix(space.id)}/api/alerts_fixture/saved_object/alert/${createdAlert.id}`

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts
@@ -301,6 +301,9 @@ export default function createUpdateApiKeyTests({ getService }: FtrProviderConte
             .expect(200);
           objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts');
 
+          // Delay before performing update to avoid 409 errors
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+
           await supertest
             .put(
               `${getUrlPrefix(space.id)}/api/alerts_fixture/saved_object/alert/${createdAlert.id}`

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts
@@ -196,6 +196,9 @@ export default function executionStatusAlertTests({ getService }: FtrProviderCon
 
       let executionStatus = await waitForStatus(alertId, new Set(['ok']));
 
+      // Delay before performing update to avoid 409 errors
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
       // break the validation of the params
       await supertest
         .put(`${getUrlPrefix(Spaces.space1.id)}/api/alerts_fixture/saved_object/alert/${alertId}`)