more robust tests

elastic · Jul 2, 2020 · 40a456d · 40a456d
1 parent edfe70b
commit 40a456d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts b/x-pack/plugins/audit_trail/server/client/audit_trail_client.ts
@@ -32,6 +32,7 @@ export class AuditTrailClient implements Auditor {
 
   public add(event: AuditableEvent) {
     const user = this.deps.getCurrentUser(this.request);
+    // doesn't use getSpace since it's async operation calling ES
     const spaceId = this.deps.getSpaceId(this.request);
 
     this.event$.next({

diff --git a/x-pack/test/plugin_functional/test_suites/audit_trail/index.ts b/x-pack/test/plugin_functional/test_suites/audit_trail/index.ts
@@ -22,10 +22,17 @@ class FileWrapper {
     const content = await this.read();
     return content.map((l) => JSON.parse(l));
   }
+  // writing in a file is an async operation. we use this method to make sure logs have been written.
+  async isNotEmpty() {
+    const content = await this.read();
+    const line = content[0];
+    return line.length > 0;
+  }
 }
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const retry = getService('retry');
 
   describe('Audit trail service', function () {
     this.tags('ciGroup7');
@@ -45,8 +52,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(204);
 
-      const content = await logFile.readJSON();
+      await retry.waitFor('logs event in the dest file', async () => {
+        return await logFile.isNotEmpty();
+      });
 
+      const content = await logFile.readJSON();
       const pingCall = content.find(
         (c) => c.meta.scope === 'audit_trail_test/context/as_current_user'
       );
@@ -62,8 +72,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(204);
 
-      const content = await logFile.readJSON();
+      await retry.waitFor('logs event in the dest file', async () => {
+        return await logFile.isNotEmpty();
+      });
 
+      const content = await logFile.readJSON();
       const pingCall = content.find(
         (c) => c.meta.scope === 'audit_trail_test/context/as_internal_user'
       );
@@ -79,8 +92,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(204);
 
-      const content = await logFile.readJSON();
+      await retry.waitFor('logs event in the dest file', async () => {
+        return await logFile.isNotEmpty();
+      });
 
+      const content = await logFile.readJSON();
       const pingCall = content.find(
         (c) => c.meta.scope === 'audit_trail_test/contract/as_current_user'
       );
@@ -96,8 +112,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(204);
 
-      const content = await logFile.readJSON();
+      await retry.waitFor('logs event in the dest file', async () => {
+        return await logFile.isNotEmpty();
+      });
 
+      const content = await logFile.readJSON();
       const pingCall = content.find(
         (c) => c.meta.scope === 'audit_trail_test/contract/as_internal_user'
       );