From 174a9db51a96a9cb7ce4216eddd9588147f890e9 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 13 Jul 2018 18:32:35 +0200
Subject: [PATCH] test: refactor test-net-connect-memleak, move to parallel

This enables the test to run as part of the regular test suite.

PR-URL: https://github.com/nodejs/node/pull/21794
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .../test-net-connect-memleak.js               | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)
 rename test/{pummel => parallel}/test-net-connect-memleak.js (64%)

diff --git a/test/pummel/test-net-connect-memleak.js b/test/parallel/test-net-connect-memleak.js
similarity index 64%
rename from test/pummel/test-net-connect-memleak.js
rename to test/parallel/test-net-connect-memleak.js
index 7546a6caeb62ea..afcc61f173509f 100644
--- a/test/pummel/test-net-connect-memleak.js
+++ b/test/parallel/test-net-connect-memleak.js
@@ -26,32 +26,32 @@ const common = require('../common');
 const assert = require('assert');
 const net = require('net');
 
-console.log('Run this test with --expose-gc');
-assert.strictEqual(
-  typeof global.gc,
-  'function'
-);
-net.createServer(function() {}).listen(common.PORT);
-
-let before = 0;
+// Test that the implicit listener for an 'connect' event on net.Sockets is
+// added using `once()`, i.e. can be gc'ed once that event has occurred.
+
+const server = net.createServer(common.mustCall()).listen(0);
+
+let collected = false;
+const gcListener = { ongc() { collected = true; } };
+
 {
-  // 2**26 == 64M entries
-  global.gc();
-  const junk = new Array(2 ** 26).fill(0);
-  before = process.memoryUsage().rss;
+  const gcObject = {};
+  common.onGC(gcObject, gcListener);
 
-  net.createConnection(common.PORT, '127.0.0.1', function() {
-    assert.notStrictEqual(junk.length, 0);  // keep reference alive
-    setTimeout(done, 10);
-    global.gc();
-  });
+  const sock = net.createConnection(
+    server.address().port,
+    common.mustCall(() => {
+      assert.strictEqual(gcObject, gcObject); // keep reference alive
+      assert.strictEqual(collected, false);
+      setImmediate(done, sock);
+    }));
 }
 
-function done() {
+function done(sock) {
   global.gc();
-  const after = process.memoryUsage().rss;
-  const reclaimed = (before - after) / 1024;
-  console.log('%d kB reclaimed', reclaimed);
-  assert(reclaimed > 128 * 1024);  // It's around 256 MB on x64.
-  process.exit();
+  setImmediate(() => {
+    assert.strictEqual(collected, true);
+    sock.end();
+    server.close();
+  });
 }