revert and use retry common util

elastic · Jun 3, 2021 · 2e8d126 · 2e8d126
1 parent a8f8599
commit 2e8d126
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 245 deletions.
diff --git a/test/api_integration/apis/telemetry/utils/index.ts b/test/api_integration/apis/telemetry/utils/index.ts
@@ -8,4 +8,3 @@
 
 export { flatKeys } from './flat_keys';
 export { assertTelemetryPayload } from './schema_to_config_schema';
-export { tryAssertionUntil } from './try_assertion_until';
diff --git a/test/api_integration/apis/telemetry/utils/try_assertion_until.test.js b/test/api_integration/apis/telemetry/utils/try_assertion_until.test.js
diff --git a/test/api_integration/apis/telemetry/utils/try_assertion_until.ts b/test/api_integration/apis/telemetry/utils/try_assertion_until.ts
diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -11,11 +11,11 @@ import { ReportManager, METRIC_TYPE, UiCounterMetricType, Report } from '@kbn/an
 import moment from 'moment';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { UsageCountersSavedObject } from '../../../../src/plugins/usage_collection/server';
-import { tryAssertionUntil } from '../telemetry/utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
+  const retry = getService('retry');
 
   const createUiCounterEvent = (eventName: string, type: UiCounterMetricType, count = 1) => ({
     eventName,
@@ -69,22 +69,15 @@ export default function ({ getService }: FtrProviderContext) {
 
       await sendReport(report);
 
-      await tryAssertionUntil(
-        async () => await fetchUsageCountersObjects(),
-        (savedObjects) => {
-          if (!savedObjects) {
-            return false;
-          }
-
-          const countTypeEvent = getCounterById(
-            savedObjects,
-            `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
-          );
-          expect(countTypeEvent.attributes.count).to.eql(1);
-        },
-        4,
-        2000
-      );
+      await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
+        const savedObjects = await fetchUsageCountersObjects();
+        const countTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
+        );
+        expect(countTypeEvent.attributes.count).to.eql(1);
+        return true;
+      });
     });
 
     it('supports multiple events', async () => {
@@ -99,35 +92,27 @@ export default function ({ getService }: FtrProviderContext) {
       ]);
 
       await sendReport(report);
-
-      await tryAssertionUntil(
-        async () => await fetchUsageCountersObjects(),
-        (savedObjects) => {
-          if (!savedObjects) {
-            return false;
-          }
-
-          const countTypeEvent = getCounterById(
-            savedObjects,
-            `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
-          );
-          expect(countTypeEvent.attributes.count).to.eql(1);
-
-          const clickTypeEvent = getCounterById(
-            savedObjects,
-            `uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
-          );
-          expect(clickTypeEvent.attributes.count).to.eql(2);
-
-          const secondEvent = getCounterById(
-            savedObjects,
-            `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
-          );
-          expect(secondEvent.attributes.count).to.eql(1);
-        },
-        4,
-        2000
-      );
+      await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
+        const savedObjects = await fetchUsageCountersObjects();
+        const countTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
+        );
+        expect(countTypeEvent.attributes.count).to.eql(1);
+
+        const clickTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
+        );
+        expect(clickTypeEvent.attributes.count).to.eql(2);
+
+        const secondEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
+        );
+        expect(secondEvent.attributes.count).to.eql(1);
+        return true;
+      });
     });
   });
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,3 @@

		export { flatKeys } from './flat_keys';
		export { assertTelemetryPayload } from './schema_to_config_schema';
		export { tryAssertionUntil } from './try_assertion_until';