[test-visibility] Fix mocha plugin tests flakiness (#4545)

DataDog · Aug 5, 2024 · e3673d7 · e3673d7
1 parent 679e7e2
commit e3673d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/datadog-instrumentations/src/mocha/main.js b/packages/datadog-instrumentations/src/mocha/main.js
@@ -395,9 +395,13 @@ addHook({
       }
 
       const asyncResource = testFileToSuiteAr.get(suite.file)
-      asyncResource.runInAsyncScope(() => {
-        testSuiteFinishCh.publish(status)
-      })
+      if (asyncResource) {
+        asyncResource.runInAsyncScope(() => {
+          testSuiteFinishCh.publish(status)
+        })
+      } else {
+        log.warn(() => `No AsyncResource found for suite ${suite.file}`)
+      }
     })
 
     return run.apply(this, arguments)

diff --git a/packages/datadog-plugin-mocha/test/index.spec.js b/packages/datadog-plugin-mocha/test/index.spec.js
@@ -480,15 +480,15 @@ describe('Plugin', () => {
           })
         })
 
-        Promise.all(assertionPromises)
-          .then(() => done())
-          .catch(done)
-
         const mocha = new Mocha({
           reporter: function () {} // silent on internal tests
         })
         mocha.addFile(testFilePath)
-        mocha.run()
+        mocha.run().on('end', () => {
+          Promise.all(assertionPromises)
+            .then(() => done())
+            .catch(done)
+        })
       })
 
       it('works when skipping suites', function (done) {