[Security Solutions][Detection Engine] Adds number of signals to wait…

…For() within integration tests to increase determinism (#81203) ## Summary * Fixes #81119 * Fixes #81186 * Adds an additional parameter to the waitFor and tweaks the different tests to pass in the number of signals to waitFor. ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
elastic · Oct 20, 2020 · 20872b6 · 20872b6
1 parent e33fd71
commit 20872b6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/basic/tests/open_close_signals.ts
@@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
       it('should be able to execute and get 10 signals', async () => {
         const rule = { ...getSimpleRule(), from: '1900-01-01T00:00:00.000Z', query: '*:*' };
         await createRule(supertest, rule);
-        await waitForSignalsToBePresent(supertest);
+        await waitForSignalsToBePresent(supertest, 10);
         const signalsOpen = await getAllSignals(supertest);
         expect(signalsOpen.hits.hits.length).equal(10);
       });
@@ -102,7 +102,7 @@ export default ({ getService }: FtrProviderContext) => {
       it('should be able to get a count of 10 closed signals when closing 10', async () => {
         const rule = { ...getSimpleRule(), from: '1900-01-01T00:00:00.000Z', query: '*:*' };
         await createRule(supertest, rule);
-        await waitForSignalsToBePresent(supertest);
+        await waitForSignalsToBePresent(supertest, 10);
         const signalsOpen = await getAllSignals(supertest);
         const signalIds = signalsOpen.hits.hits.map((signal) => signal._id);
 

diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts
@@ -435,7 +435,7 @@ export default ({ getService }: FtrProviderContext) => {
             ],
           };
           await createRule(supertest, ruleWithException);
-          await waitForSignalsToBePresent(supertest);
+          await waitForSignalsToBePresent(supertest, 10);
           const signalsOpen = await getAllSignals(supertest);
           expect(signalsOpen.hits.hits.length).equal(10);
         });

diff --git a/...test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts b/...test/detection_engine_api_integration/security_and_spaces/tests/create_threat_matching.ts
@@ -120,7 +120,7 @@ export default ({ getService }: FtrProviderContext) => {
         };
 
         await createRule(supertest, rule);
-        await waitForSignalsToBePresent(supertest);
+        await waitForSignalsToBePresent(supertest, 10);
         const signalsOpen = await getAllSignals(supertest);
         expect(signalsOpen.hits.hits.length).equal(10);
       });

diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/open_close_signals.ts
@@ -78,7 +78,7 @@ export default ({ getService }: FtrProviderContext) => {
         it('should be able to execute and get 10 signals', async () => {
           const rule = { ...getSimpleRule(), from: '1900-01-01T00:00:00.000Z', query: '*:*' };
           await createRule(supertest, rule);
-          await waitForSignalsToBePresent(supertest);
+          await waitForSignalsToBePresent(supertest, 10);
           const signalsOpen = await getAllSignals(supertest);
           expect(signalsOpen.hits.hits.length).equal(10);
         });
@@ -101,7 +101,7 @@ export default ({ getService }: FtrProviderContext) => {
         it('should be able to get a count of 10 closed signals when closing 10', async () => {
           const rule = { ...getSimpleRule(), from: '1900-01-01T00:00:00.000Z', query: '*:*' };
           await createRule(supertest, rule);
-          await waitForSignalsToBePresent(supertest);
+          await waitForSignalsToBePresent(supertest, 10);
           const signalsOpen = await getAllSignals(supertest);
           const signalIds = signalsOpen.hits.hits.map((signal) => signal._id);
 
@@ -124,7 +124,7 @@ export default ({ getService }: FtrProviderContext) => {
           expect(signalsClosed.hits.hits.length).to.equal(10);
         });
 
-        it('should be able close 10 signals immediately and they all should be closed', async () => {
+        it('should be able close signals immediately and they all should be closed', async () => {
           const rule = { ...getSimpleRule(), from: '1900-01-01T00:00:00.000Z', query: '*:*' };
           await createRule(supertest, rule);
           await waitForSignalsToBePresent(supertest);

diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -794,11 +794,14 @@ export const waitForRuleSuccess = async (
 };
 
 /**
- * Waits for the signal hits to be greater than zero before continuing
+ * Waits for the signal hits to be greater than the supplied number
+ * before continuing with a default of at least one signal
  * @param supertest Deps
+ * @param numberOfSignals The number of signals to wait for, default is 1
  */
 export const waitForSignalsToBePresent = async (
-  supertest: SuperTest<supertestAsPromised.Test>
+  supertest: SuperTest<supertestAsPromised.Test>,
+  numberOfSignals = 1
 ): Promise<void> => {
   await waitFor(async () => {
     const {
@@ -808,7 +811,7 @@ export const waitForSignalsToBePresent = async (
       .set('kbn-xsrf', 'true')
       .send(getQueryAllSignals())
       .expect(200);
-    return signalsOpen.hits.hits.length > 0;
+    return signalsOpen.hits.hits.length >= numberOfSignals;
   });
 };