test: fix failing tests (nodejs#2097)

* test: increase timeout for some redirect- tests * test: fixes * test: fixes * test: fixes * test: fixes * test: fixes * test: fixes * test: fixes * test: fixes
metcoder95 · Jul 21, 2023 · eb4a4fd · eb4a4fd
1 parent c1429e2
commit eb4a4fd
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 152 deletions.
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "lint:fix": "standard --fix | snazzy",
     "test": "npm run test:tap && npm run test:node-fetch && npm run test:fetch && npm run test:cookies && npm run test:wpt && npm run test:websocket && npm run test:jest && npm run test:typescript",
     "test:cookies": "node scripts/verifyVersion 16 || tap test/cookie/*.js",
-    "test:node-fetch": "node scripts/verifyVersion.js 16 || mocha test/node-fetch",
+    "test:node-fetch": "node scripts/verifyVersion.js 16 || mocha --exit test/node-fetch",
     "test:fetch": "node scripts/verifyVersion.js 16 || (npm run build:node && tap --expose-gc test/fetch/*.js && tap test/webidl/*.js)",
     "test:jest": "node scripts/verifyVersion.js 14 || jest",
     "test:tap": "tap test/*.js test/diagnostics-channel/*.js",

diff --git a/test/agent.js b/test/agent.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { test } = require('tap')
+const { test, teardown } = require('tap')
 const http = require('http')
 const { PassThrough } = require('stream')
 const { kRunning } = require('../lib/core/symbols')
@@ -705,3 +705,5 @@ test('the dispatcher is truly global', t => {
   t.equal(agent, undiciFresh.getGlobalDispatcher())
   t.end()
 })
+
+teardown(() => process.exit())
diff --git a/test/connect-timeout.js b/test/connect-timeout.js
@@ -8,16 +8,16 @@ const sleep = require('atomic-sleep')
 test('priotorise socket errors over timeouts', (t) => {
   t.plan(1)
   const connectTimeout = 1000
-  const client = new Pool('http://foobar.bar:1234', { connectTimeout })
+  const client = new Pool('http://foobar.bar:1234', { connectTimeout: 1 })
 
   client.request({ method: 'GET', path: '/foobar' })
     .then(() => t.fail())
     .catch((err) => {
       t.equal(err.code, 'ENOTFOUND')
     })
 
-  // block for 2s which is enough for the dns lookup to complete and TO to fire
-  sleep(connectTimeout * 2)
+  // block for 1s which is enough for the dns lookup to complete and TO to fire
+  sleep(connectTimeout)
 })
 
 // never connect

diff --git a/test/fetch/client-fetch.js b/test/fetch/client-fetch.js
@@ -2,7 +2,7 @@
 
 'use strict'
 
-const { test } = require('tap')
+const { test, teardown } = require('tap')
 const { createServer } = require('http')
 const { ReadableStream } = require('stream/web')
 const { Blob } = require('buffer')
@@ -672,3 +672,5 @@ test('Receiving non-Latin1 headers', async (t) => {
   t.same(lengths, [30, 34, 94, 104, 90])
   t.end()
 })
+
+teardown(() => process.exit())
diff --git a/test/fetch/jsdom-abortcontroller-1910-1464495619.js b/test/fetch/jsdom-abortcontroller-1910-1464495619.js
@@ -10,11 +10,15 @@ const { JSDOM } = require('jsdom')
 test('third party AbortControllers', async (t) => {
   const server = createServer((_, res) => res.end()).listen(0)
 
-  t.teardown(server.close.bind(server))
-  await once(server, 'listening')
-
   const { AbortController } = new JSDOM().window
-  const controller = new AbortController()
+  let controller = new AbortController()
+
+  t.teardown(() => {
+    controller.abort()
+    controller = null
+    return server.close()
+  })
+  await once(server, 'listening')
 
   await t.resolves(fetch(`http://localhost:${server.address().port}`, {
     signal: controller.signal

diff --git a/test/fetch/request.js b/test/fetch/request.js
@@ -2,13 +2,12 @@
 
 'use strict'
 
-const { test } = require('tap')
+const { test, teardown } = require('tap')
 const {
   Request,
   Headers,
   fetch
 } = require('../../')
-const { kState } = require('../../lib/fetch/symbols.js')
 const {
   Blob: ThirdPartyBlob,
   FormData: ThirdPartyFormData
@@ -199,7 +198,7 @@ test('undefined window', t => {
 
 test('undefined body', t => {
   const req = new Request('http://asd', { body: undefined })
-  t.equal(req[kState].body, null)
+  t.equal(req.body, null)
   t.end()
 })
 
@@ -298,7 +297,7 @@ test('post aborted signal', t => {
     } else {
       t.pass()
     }
-  })
+  }, { once: true })
   ac.abort('gwak')
 })
 
@@ -346,7 +345,7 @@ test('post aborted signal cloned', t => {
     } else {
       t.pass()
     }
-  })
+  }, { once: true })
   ac.abort('gwak')
 })
 
@@ -476,3 +475,5 @@ test('set-cookie headers get cleared when passing a Request as first param', (t)
   t.same(req2.headers.getSetCookie(), [])
   t.end()
 })
+
+teardown(() => process.exit())
diff --git a/test/proxy-agent.js b/test/proxy-agent.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { test } = require('tap')
+const { test, teardown } = require('tap')
 const { request, fetch, setGlobalDispatcher, getGlobalDispatcher } = require('..')
 const { InvalidArgumentError } = require('../lib/core/errors')
 const { nodeMajor } = require('../lib/core/util')
@@ -692,3 +692,5 @@ function buildSSLProxy () {
     server.listen(0, () => resolve(server))
   })
 }
+
+teardown(() => process.exit())