From 9a34c5b8d57117ede5deb87c9798dbadbc030050 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 13 Jul 2018 18:32:35 +0200 Subject: test: refactor test-tls-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 Reviewed-By: James M Snell --- test/parallel/test-tls-connect-memleak.js | 65 +++++++++++++++++++++++++++++++ test/pummel/test-tls-connect-memleak.js | 65 ------------------------------- 2 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 test/parallel/test-tls-connect-memleak.js delete mode 100644 test/pummel/test-tls-connect-memleak.js diff --git a/test/parallel/test-tls-connect-memleak.js b/test/parallel/test-tls-connect-memleak.js new file mode 100644 index 0000000000..95f71acdc3 --- /dev/null +++ b/test/parallel/test-tls-connect-memleak.js @@ -0,0 +1,65 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +'use strict'; +// Flags: --expose-gc + +const common = require('../common'); +if (!common.hasCrypto) + common.skip('missing crypto'); + +const assert = require('assert'); +const tls = require('tls'); +const fixtures = require('../common/fixtures'); + +// Test that the implicit listener for an 'connect' event on tls.Sockets is +// added using `once()`, i.e. can be gc'ed once that event has occurred. + +const server = tls.createServer({ + cert: fixtures.readSync('test_cert.pem'), + key: fixtures.readSync('test_key.pem') +}).listen(0); + +let collected = false; +const gcListener = { ongc() { collected = true; } }; + +{ + const gcObject = {}; + common.onGC(gcObject, gcListener); + + const sock = tls.connect( + server.address().port, + { rejectUnauthorized: false }, + common.mustCall(() => { + assert.strictEqual(gcObject, gcObject); // keep reference alive + assert.strictEqual(collected, false); + setImmediate(done, sock); + })); +} + +function done(sock) { + global.gc(); + setImmediate(() => { + assert.strictEqual(collected, true); + sock.end(); + server.close(); + }); +} diff --git a/test/pummel/test-tls-connect-memleak.js b/test/pummel/test-tls-connect-memleak.js deleted file mode 100644 index 6809b23baf..0000000000 --- a/test/pummel/test-tls-connect-memleak.js +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -'use strict'; -// Flags: --expose-gc - -const common = require('../common'); -if (!common.hasCrypto) - common.skip('missing crypto'); - -const assert = require('assert'); -const tls = require('tls'); -const fixtures = require('../common/fixtures'); - -assert.strictEqual( - typeof global.gc, - 'function', - `Type of global.gc is not a function. Type: ${typeof global.gc}.` + - ' Run this test with --expose-gc' -); - -tls.createServer({ - cert: fixtures.readSync('test_cert.pem'), - key: fixtures.readSync('test_key.pem') -}).listen(common.PORT); - -{ - // 2**26 == 64M entries - const junk = new Array(2 ** 26).fill(0); - - const options = { rejectUnauthorized: false }; - tls.connect(common.PORT, '127.0.0.1', options, function() { - assert.notStrictEqual(junk.length, 0); // keep reference alive - setTimeout(done, 10); - global.gc(); - }); -} - -function done() { - const before = process.memoryUsage().rss; - global.gc(); - const after = process.memoryUsage().rss; - const reclaimed = (before - after) / 1024; - console.log('%d kB reclaimed', reclaimed); - assert(reclaimed > 256 * 1024); // it's more like 512M on x64 - process.exit(); -} -- cgit v1.2.1