Fix overhead controller test flakyness (#5824)

Author: uurien

packages/dd-trace/test/appsec/iast/overhead-controller.spec.js

@@ -411,7 +411,6 @@ describe('Overhead controller', () => {
 
       function tests (serverConfig) {
         const handlers = []
-
         beforeEach(() => {
           testRequestEventEmitter
             .removeAllListeners(TEST_REQUEST_STARTED)
@@ -583,29 +582,27 @@ describe('Overhead controller', () => {
           }
           handlers.push(handler)
           agent.subscribe(handler)
-
           testRequestEventEmitter.on(TEST_REQUEST_STARTED, (url) => {
             if (url === FIRST_REQUEST) {
               axios.get(`http://localhost:${serverConfig.port}${SECOND_REQUEST}`).then().catch(done)
             } else if (url === SECOND_REQUEST) {
               axios.get(`http://localhost:${serverConfig.port}${THIRD_REQUEST}`).then().catch(done)
             } else if (url === THIRD_REQUEST) {
               requestResolvers[FIRST_REQUEST]()
+            } else if (url === FOURTH_REQUEST) {
+              axios.get(`http://localhost:${serverConfig.port}${FIFTH_REQUEST}`).then().catch(done)
             } else if (url === FIFTH_REQUEST) {
               requestResolvers[SECOND_REQUEST]()
             }
           })
+
           testRequestEventEmitter.on(TEST_REQUEST_FINISHED, (url) => {
             if (url === FIRST_REQUEST) {
               axios.get(`http://localhost:${serverConfig.port}${FOURTH_REQUEST}`).then().catch(done)
-              axios.get(`http://localhost:${serverConfig.port}${FIFTH_REQUEST}`).then().catch(done)
             } else if (url === SECOND_REQUEST) {
-              // Previously this was a setImmediate, but that made this flaky. Waiting 100ms de-flakes it.
-              setTimeout(() => {
-                requestResolvers[THIRD_REQUEST]()
-                requestResolvers[FOURTH_REQUEST]()
-                requestResolvers[FIFTH_REQUEST]()
-              }, 100)
+              requestResolvers[THIRD_REQUEST]()
+              requestResolvers[FOURTH_REQUEST]()
+              requestResolvers[FIFTH_REQUEST]()
             }
           })
 

packages/dd-trace/test/appsec/iast/utils.js

@@ -21,6 +21,13 @@ function testInRequest (app, tests) {
   let appListener
   const config = {}
 
+  before(() => {
+    return agent.load('http', undefined, { flushInterval: 1 })
+      .then(() => {
+        http = require('http')
+      })
+  })
+
   beforeEach(() => {
     listener = (req, res) => {
       const appResult = app && app(req, res)
@@ -36,13 +43,6 @@ function testInRequest (app, tests) {
     }
   })
 
-  beforeEach(() => {
-    return agent.load('http', undefined, { flushInterval: 1 })
-      .then(() => {
-        http = require('http')
-      })
-  })
-
   beforeEach(done => {
     const server = new http.Server(listener)
     appListener = server
@@ -54,6 +54,9 @@ function testInRequest (app, tests) {
 
   afterEach(() => {
     appListener && appListener.close()
+  })
+
+  after(() => {
     return agent.close({ ritmReset: false })
   })