Apply PR #1100 changes: Remove flaky test and reorganize test setup

Co-authored-by: sonnyp <[email protected]>

Author: Copilot

test/stream-management.test.js

@@ -11,14 +11,20 @@ const domain = "localhost";
 
 let xmpp;
 
-afterEach(async () => {
+beforeAll(async () => {
+  await server.enableModules(["smacks"]);
+});
+
+beforeEach(async () => {
+  await server.restart();
+});
+
+afterAll(async () => {
   await xmpp?.stop();
   await server.reset();
 });
 
 test("client ack stanzas", async () => {
-  await server.enableModules(["smacks"]);
-  await server.restart();
 
   xmpp = client({ credentials, service: domain });
   debug(xmpp);
@@ -36,9 +42,6 @@ test("client ack stanzas", async () => {
 });
 
 test("client fail stanzas", async () => {
-  await server.enableModules(["smacks"]);
-  await server.restart();
-
   xmpp = client({ credentials, service: domain });
   debug(xmpp);
 
@@ -60,9 +63,6 @@ test("client fail stanzas", async () => {
 });
 
 test("client retry stanzas", async () => {
-  await server.enableModules(["smacks"]);
-  await server.restart();
-
   xmpp = client({ credentials, service: domain });
   debug(xmpp);
 
@@ -86,9 +86,6 @@ test("client retry stanzas", async () => {
 });
 
 test("client reconnects when server fails to ack stanza", async () => {
-  await server.enableModules(["smacks"]);
-  await server.restart();
-
   xmpp = client({ credentials, service: domain });
   xmpp.streamManagement.timeout = 10;
   xmpp.streamManagement.requestAckInterval = 5;
@@ -110,39 +107,3 @@ test("client reconnects when server fails to ack stanza", async () => {
   await promise_resumed;
   expect().pass();
 });
-
-test("pings do not prevent timeout", async () => {
-  await server.enableModules(["smacks"]);
-  await server.restart();
-
-  xmpp = client({ credentials, service: domain });
-  xmpp.streamManagement.timeout = 10;
-  xmpp.streamManagement.requestAckInterval = 5;
-
-  // Make sure an ack request is sent right away after a stanza
-  xmpp.streamManagement.debounceAckRequest = 1;
-  debug(xmpp);
-
-  let promise_disconnect = new Promise((resolve) => {
-    xmpp.disconnect = () => {
-      resolve();
-      return Promise.resolve(null);
-    };
-  });
-  await xmpp.start();
-
-  // Send just any stanza to trigger the act request send
-  xmpp.send(
-    <iq to={domain} id="ping" type="get">
-      <ping xmlns="urn:xmppp:ping" />
-    </iq>,
-  );
-
-  // Pretend we don't receive the ack by removing event listeners
-  // on the socket, so that the timeout can fire
-  xmpp._detachSocket();
-
-  // Timeout fires, and disconnect happens
-  await promise_disconnect;
-  expect().pass();
-});