From 0c25a0ba1f228a867977f99daa618267b55ced41 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Mon, 11 Mar 2024 07:56:49 +0100
Subject: [PATCH] Wait for disconnect only if no admintest.

---
 src/node/hooks/express.ts          | 2 +-
 src/node/hooks/express/socketio.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/hooks/express.ts b/src/node/hooks/express.ts
index b273887d6..29da71ac3 100644
--- a/src/node/hooks/express.ts
+++ b/src/node/hooks/express.ts
@@ -46,7 +46,7 @@ const closeServer = async () => {
       for (const socket of sockets) socket.destroy(new Error('HTTP server is closing'));
     }, 5000);
     let lastLogged = 0;
-    while (sockets.size > 0) {
+    while (sockets.size > 0  && !settings.enableAdminUITests) {
       if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs.
         logger.info(`Waiting for ${sockets.size} HTTP clients to disconnect...`);
         lastLogged = Date.now();
diff --git a/src/node/hooks/express/socketio.ts b/src/node/hooks/express/socketio.ts
index e64a16847..bbdec1c1c 100644
--- a/src/node/hooks/express/socketio.ts
+++ b/src/node/hooks/express/socketio.ts
@@ -38,7 +38,7 @@ export const expressCloseServer = async () => {
   // not appear to be a way to get all clients across all namespaces without tracking them
   // ourselves, so that is what we do.
   let lastLogged = 0;
-  while (sockets.size > 0) {
+  while (sockets.size > 0 && !settings.enableAdminUITests) {
     if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs.
       logger.info(`Waiting for ${sockets.size} socket.io clients to disconnect...`);
       lastLogged = Date.now();