fix #192: tmp must not exit the process on its own

Author: silkentrance

lib/tmp.js

@@ -627,14 +627,8 @@ function _safely_install_sigint_listener() {
  // ignore
  }
  }
- try {
- // force the garbage collector even it is called again in the exit listener
- _garbageCollector();
- } finally {
- if (!!doExit) {
- process.exit(0);
- }
- }
+ // force the garbage collector even it is called again in the exit listener
+ _garbageCollector();
  });
 }
 

test/issue121-test.js

@@ -7,8 +7,8 @@ const
  os = require('os'),
  rimraf = require('rimraf'),
  testCases = [
- { signal: 'SIGINT', expectExists: false },
- { signal: 'SIGTERM', expectExists: true }
+ 'SIGINT',
+ 'SIGTERM'
  ];
 
 // skip tests on win32
@@ -18,10 +18,10 @@ const tfunc = isWindows ? xit : it;
 describe('tmp', function () {
  describe('issue121 - clean up on terminating signals', function () {
  for (let tc of testCases) {
- tfunc('for signal ' + tc.signal, function (done) {
- // increase timeout so that the child process may fail
- this.timeout(20000);
- issue121Tests(tc.signal, tc.expectExists)(done);
+ tfunc('for signal ' + tc, function (done) {
+ // increase timeout so that the child process may terminate in time
+ this.timeout(5000);
+ issue121Tests(tc)(done);
  });
  }
  });
@@ -33,22 +33,8 @@ function issue121Tests(signal, expectExists) {
  if (err) return done(err);
  else if (stderr) return done(new Error(stderr));
 
- try {
- if (expectExists) {
- assertions.assertExists(stdout);
- }
- else {
- assertions.assertDoesNotExist(stdout);
- }
- done();
- } catch (err) {
- done(err);
- } finally {
- // cleanup
- if (expectExists) {
- rimraf.sync(stdout);
- }
- }
+ assertions.assertDoesNotExist(stdout);
+ done();
  }, signal);
  };
 }

test/outband/issue121.js

@@ -4,6 +4,15 @@
 const
  tmp = require('../../lib/tmp');
 
+// install exit handler since tmp will no longer exit on its own
+process.on('SIGINT', function () {
+ process.exit(0);
+});
+
+process.on('SIGTERM', function () {
+ process.exit(0);
+});
+
 // https://github.com/raszi/node-tmp/issues/121
 module.exports = function () {