remove get-port from instrumentation tests

DataDog · Jun 22, 2024 · e9e2947 · e9e2947
1 parent 99c19a7
commit e9e2947
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 36 deletions.
diff --git a/packages/datadog-instrumentations/test/body-parser.spec.js b/packages/datadog-instrumentations/test/body-parser.spec.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const getPort = require('get-port')
 const dc = require('dc-polyfill')
 const axios = require('axios')
 const agent = require('../../dd-trace/test/plugins/agent')
@@ -22,11 +21,9 @@ withVersions('body-parser', 'body-parser', version => {
         middlewareProcessBodyStub()
         res.end('DONE')
       })
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(0, () => {
+        port = server.address().port
+        done()
       })
     })
     beforeEach(async () => {

diff --git a/packages/datadog-instrumentations/test/cookie-parser.spec.js b/packages/datadog-instrumentations/test/cookie-parser.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const { assert } = require('chai')
-const getPort = require('get-port')
 const dc = require('dc-polyfill')
 const axios = require('axios')
 const agent = require('../../dd-trace/test/plugins/agent')
@@ -23,11 +22,9 @@ withVersions('cookie-parser', 'cookie-parser', version => {
         middlewareProcessCookieStub()
         res.end('DONE')
       })
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(0, () => {
+        port = server.address().port
+        done()
       })
     })
     beforeEach(async () => {

diff --git a/packages/datadog-instrumentations/test/express-mongo-sanitize.spec.js b/packages/datadog-instrumentations/test/express-mongo-sanitize.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const agent = require('../../dd-trace/test/plugins/agent')
-const getPort = require('get-port')
 const { channel } = require('dc-polyfill')
 const axios = require('axios')
 describe('express-mongo-sanitize', () => {
@@ -25,11 +24,9 @@ describe('express-mongo-sanitize', () => {
           res.end()
         })
 
-        getPort().then(newPort => {
-          port = newPort
-          server = app.listen(port, () => {
-            done()
-          })
+        server = app.listen(0, () => {
+          port = server.address().port
+          done()
         })
       })
 

diff --git a/packages/datadog-instrumentations/test/express.spec.js b/packages/datadog-instrumentations/test/express.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const agent = require('../../dd-trace/test/plugins/agent')
-const getPort = require('get-port')
 const axios = require('axios')
 const dc = require('dc-polyfill')
 
@@ -20,11 +19,9 @@ withVersions('express', 'express', version => {
         requestBody()
         res.end('DONE')
       })
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(0, () => {
+        port = server.address().port
+        done()
       })
     })
     beforeEach(async () => {

diff --git a/packages/datadog-instrumentations/test/passport-http.spec.js b/packages/datadog-instrumentations/test/passport-http.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const agent = require('../../dd-trace/test/plugins/agent')
-const getPort = require('get-port')
 const axios = require('axios')
 const dc = require('dc-polyfill')
 
@@ -70,11 +69,9 @@ withVersions('passport-http', 'passport-http', version => {
         subscriberStub(arguments[0])
       })
 
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(0, () => {
+        port = server.address().port
+        done()
       })
     })
     beforeEach(() => {

diff --git a/packages/datadog-instrumentations/test/passport-local.spec.js b/packages/datadog-instrumentations/test/passport-local.spec.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const agent = require('../../dd-trace/test/plugins/agent')
-const getPort = require('get-port')
 const axios = require('axios')
 const dc = require('dc-polyfill')
 
@@ -71,11 +70,9 @@ withVersions('passport-local', 'passport-local', version => {
         subscriberStub(arguments[0])
       })
 
-      getPort().then(newPort => {
-        port = newPort
-        server = app.listen(port, () => {
-          done()
-        })
+      server = app.listen(0, () => {
+        port = server.address().port
+        done()
       })
     })
     beforeEach(() => {