flaky (#6021)

Author: Eomm

test/toolkit.js

@@ -0,0 +1,32 @@
+'use strict'
+
+exports.waitForCb = function (options) {
+  let count = null
+  let done = false
+  let iResolve
+  let iReject
+
+  function stepIn () {
+    if (done) {
+      iReject(new Error('Unexpected done call'))
+      return
+    }
+
+    if (--count) {
+      return
+    }
+
+    done = true
+    iResolve()
+  }
+
+  const patience = new Promise((resolve, reject) => {
+    iResolve = resolve
+    iReject = reject
+  })
+
+  count = options.steps || 1
+  done = false
+
+  return { stepIn, patience }
+}

test/trust-proxy.test.js

@@ -4,6 +4,7 @@ const { test, before } = require('node:test')
 const sget = require('simple-get').concat
 const fastify = require('..')
 const helper = require('./helper')
+const { waitForCb } = require('./toolkit')
 
 const noop = () => {}
 
@@ -69,18 +70,14 @@ test('trust proxy, not add properties to node req', (t, done) => {
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
 
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxy', undefined, completed)
-    sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxychain', undefined, completed)
+    const completion = waitForCb({ steps: 2 })
 
-    let pending = 2
-    function completed () {
-      if (--pending === 0) {
-        done()
-      }
-    }
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxy', undefined, completion.stepIn)
+    sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxychain', undefined, completion.stepIn)
+
+    completion.patience.then(done)
   })
 })
 
@@ -89,16 +86,15 @@ test('trust proxy chain', (t, done) => {
   const app = fastify({
     trustProxy: [localhost, '192.168.1.1']
   })
+  t.after(() => app.close())
 
   app.get('/trustproxychain', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '192.168.1.1, 1.1.1.1', '/trustproxychain', undefined, done)
   })
 })
@@ -108,15 +104,15 @@ test('trust proxy function', (t, done) => {
   const app = fastify({
     trustProxy: (address) => address === localhost
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyfunc', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '1.1.1.1', '/trustproxyfunc', undefined, done)
   })
 })
@@ -126,15 +122,15 @@ test('trust proxy number', (t, done) => {
   const app = fastify({
     trustProxy: 1
   })
+  t.after(() => app.close())
+
   app.get('/trustproxynumber', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', ips: [localhost, '1.1.1.1'], host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxynumber', undefined, done)
   })
 })
@@ -144,15 +140,15 @@ test('trust proxy IP addresses', (t, done) => {
   const app = fastify({
     trustProxy: `${localhost}, 2.2.2.2`
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyipaddrs', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', ips: [localhost, '1.1.1.1'], host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '3.3.3.3, 2.2.2.2, 1.1.1.1', '/trustproxyipaddrs', undefined, done)
   })
 })
@@ -162,6 +158,8 @@ test('trust proxy protocol', (t, done) => {
   const app = fastify({
     trustProxy: true
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyprotocol', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', protocol: 'lorem', host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
@@ -175,14 +173,16 @@ test('trust proxy protocol', (t, done) => {
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
-  t.after(() => app.close())
-
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocol', 'lorem')
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxynoprotocol')
+
+    const completion = waitForCb({ steps: 3 })
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocol', 'lorem', completion.stepIn)
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxynoprotocol', undefined, completion.stepIn)
+
     // Allow for sgetForwardedRequest requests above to finish
-    setTimeout(() => sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocols', 'ipsum, dolor', done))
+    setTimeout(() => sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocols', 'ipsum, dolor', completion.stepIn))
+
+    completion.patience.then(done)
   })
 })