nodejs
diff --git a/Collapse file
‎test/parallel/test-abortsignal-drop-settled-signals.mjs‎
Copy file name to clipboardExpand all lines: test/parallel/test-abortsignal-drop-settled-signals.mjs
+17-12Lines changed: 17 additions & 12 deletions b/Collapse file
‎test/parallel/test-abortsignal-drop-settled-signals.mjs‎
Copy file name to clipboardExpand all lines: test/parallel/test-abortsignal-drop-settled-signals.mjs
+17-12Lines changed: 17 additions & 12 deletions
@@ -134,25 +134,30 @@ it('does not prevent source signal from being GCed if it is short-lived', (t, do
 
 it('drops settled dependant signals when signal is composite', (t, done) => {
   const controllers = Array.from({ length: 2 }, () => new AbortController());
-  const composedSignal1 = AbortSignal.any([controllers[0].signal]);
-  const composedSignalRef = new WeakRef(AbortSignal.any([composedSignal1, controllers[1].signal]));
+
+  // Using WeakRefs to avoid this test to retain information that will make the test fail
+  const composedSignal1 = new WeakRef(AbortSignal.any([controllers[0].signal]));
+  const composedSignalRef = new WeakRef(AbortSignal.any([composedSignal1.deref(), controllers[1].signal]));
 
   const kDependantSignals = Object.getOwnPropertySymbols(controllers[0].signal).find(
     (s) => s.toString() === 'Symbol(kDependantSignals)'
   );
 
-  setImmediate(() => {
-    global.gc({ execution: 'async' }).then(() => {
-      t.assert.strictEqual(composedSignalRef.deref(), undefined);
-      t.assert.strictEqual(controllers[0].signal[kDependantSignals].size, 2);
-      t.assert.strictEqual(controllers[1].signal[kDependantSignals].size, 1);
-
-      setImmediate(() => {
-        t.assert.strictEqual(controllers[0].signal[kDependantSignals].size, 0);
-        t.assert.strictEqual(controllers[1].signal[kDependantSignals].size, 0);
+  t.assert.strictEqual(controllers[0].signal[kDependantSignals].size, 2);
+  t.assert.strictEqual(controllers[1].signal[kDependantSignals].size, 1);
 
-        done();
+  setImmediate(() => {
+    global.gc({ execution: 'async' }).then(async () => {
+      await gcUntil('all signals are GCed', () => {
+        const totalDependantSignals = Math.max(
+          controllers[0].signal[kDependantSignals].size,
+          controllers[1].signal[kDependantSignals].size
+        );
+
+        return composedSignalRef.deref() === undefined && totalDependantSignals === 0;
       });
+
+      done();
     });
   });
 });