Merge branch 'gh-133'

fix #134 revert changes to tests introduced by #133
raszi · Jul 10, 2017 · 8f73d89 · 8f73d89
2 parents f8db66b + 6c2f762
commit 8f73d89
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 80 deletions.
diff --git a/test/base.js b/test/base.js
@@ -1,14 +1,9 @@
 var
   assert = require('assert'),
-  fs     = require('fs'),
   path   = require('path'),
   spawn   = require('child_process').spawn,
-  existsSync = fs.existsSync || path.existsSync,
   tmp    = require('../lib/tmp');
 
-var _cleanup_fn = undefined;
-
-// FIXME:does not seem to work at all
 // make sure that we do not test spam the global tmp
 tmp.TMP_DIR = './tmp';
 
@@ -205,18 +200,6 @@ function _testIssue115FileSync(cb) {
   _spawnTestWithError('issue115-file-sync.js', [], cb);
 }
 
-function _testCleanup(err, name, fd, fn) {
-  var actual_fn = fn;
-  if (typeof(fd) == 'function') actual_fn = fd;
-  if (actual_fn) actual_fn();
-  assert.ok(!existsSync(name), 'should not exist');
-}
-
-function _testCleanupSync(result) {
-  result.removeCallback();
-  assert.ok(!existsSync(result.name), 'should not exist');
-}
-
 module.exports.testStat = _testStat;
 module.exports.testPrefix = _testPrefix;
 module.exports.testPrefixSync = _testPrefixSync;
@@ -237,5 +220,3 @@ module.exports.testIssue115File = _testIssue115File;
 module.exports.testIssue115FileSync = _testIssue115FileSync;
 module.exports.testUnsafeCleanupSync = _testUnsafeCleanupSync;
 module.exports.testIssue62Sync = _testIssue62Sync;
-module.exports.testCleanup = _testCleanup;
-module.exports.testCleanupSync = _testCleanupSync;
diff --git a/test/dir-sync-test.js b/test/dir-sync-test.js
@@ -31,8 +31,7 @@ vows.describe('Synchronous directory creation').addBatch({
 
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040700),
-    'should have the default prefix': Test.testPrefixSync('tmp-'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the default prefix': Test.testPrefixSync('tmp-')
   },
 
   'when using with prefix': {
@@ -42,8 +41,7 @@ vows.describe('Synchronous directory creation').addBatch({
 
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040700),
-    'should have the provided prefix': Test.testPrefixSync('something'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided prefix': Test.testPrefixSync('something')
   },
 
   'when using with postfix': {
@@ -53,8 +51,7 @@ vows.describe('Synchronous directory creation').addBatch({
 
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040700),
-    'should have the provided postfix': Test.testPostfixSync('.txt'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('.txt')
   },
 
   'when using template': {
@@ -65,8 +62,7 @@ vows.describe('Synchronous directory creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040700),
     'should have the provided prefix': Test.testPrefixSync('clike-'),
-    'should have the provided postfix': Test.testPostfixSync('-postfix'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('-postfix')
   },
 
   'when using name': {
@@ -78,8 +74,9 @@ vows.describe('Synchronous directory creation').addBatch({
     'should have the provided name': Test.testNameSync(path.join(tmp.tmpdir, 'using-name')),
     'should be a directory': function (result) {
       _testDir(040700)(result);
-    },
-    'should have been cleaned up': Test.testCleanupSync
+      result.removeCallback();
+      assert.ok(!existsSync(result.name), 'Directory should be removed');
+    }
   },
 
   'when using multiple options': {
@@ -90,8 +87,7 @@ vows.describe('Synchronous directory creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040750),
     'should have the provided prefix': Test.testPrefixSync('foo'),
-    'should have the provided postfix': Test.testPostfixSync('bar'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('bar')
   },
 
   'when using multiple options and mode': {
@@ -102,8 +98,7 @@ vows.describe('Synchronous directory creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a directory': _testDir(040755),
     'should have the provided prefix': Test.testPrefixSync('complicated'),
-    'should have the provided postfix': Test.testPostfixSync('options'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('options')
   },
 
   'no tries': {

diff --git a/test/dir-test.js b/test/dir-test.js
@@ -11,6 +11,7 @@ var
   tmp    = require('../lib/tmp.js'),
   Test   = require('./base.js');
 
+
 function _testDir(mode) {
   return function _testDirGenerated(err, name) {
     assert.ok(existsSync(name), 'should exist');
@@ -22,16 +23,14 @@ function _testDir(mode) {
   };
 }
 
-
 vows.describe('Directory creation').addBatch({
   'when using without parameters': {
     topic: function () {
       tmp.dir(this.callback);
     },
 
     'should be a directory': _testDir(040700),
-    'should have the default prefix': Test.testPrefix('tmp-'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the default prefix': Test.testPrefix('tmp-')
   },
 
   'when using with prefix': {
@@ -42,8 +41,7 @@ vows.describe('Directory creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040700),
-    'should have the provided prefix': Test.testPrefix('something'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided prefix': Test.testPrefix('something')
   },
 
   'when using with postfix': {
@@ -54,8 +52,7 @@ vows.describe('Directory creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040700),
-    'should have the provided postfix': Test.testPostfix('.txt'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('.txt')
   },
 
   'when using template': {
@@ -67,8 +64,7 @@ vows.describe('Directory creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040700),
     'should have the provided prefix': Test.testPrefix('clike-'),
-    'should have the provided postfix': Test.testPostfix('-postfix'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('-postfix')
   },
 
   'when using name': {
@@ -79,8 +75,7 @@ vows.describe('Directory creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040700),
-    'should have the provided name': Test.testName(path.join(tmp.tmpdir, 'using-name')),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided name': Test.testName(path.join(tmp.tmpdir, 'using-name'))
   },
 
   'when using multiple options': {
@@ -92,8 +87,7 @@ vows.describe('Directory creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040750),
     'should have the provided prefix': Test.testPrefix('foo'),
-    'should have the provided postfix': Test.testPostfix('bar'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('bar')
   },
 
   'when using multiple options and mode': {
@@ -105,8 +99,7 @@ vows.describe('Directory creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a directory': _testDir(040755),
     'should have the provided prefix': Test.testPrefix('complicated'),
-    'should have the provided postfix': Test.testPostfix('options'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('options')
   },
 
   'no tries': {

diff --git a/test/file-sync-test.js b/test/file-sync-test.js
@@ -43,8 +43,7 @@ vows.describe('Synchronous file creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100600, true),
     'should have the default prefix': Test.testPrefixSync('tmp-'),
-    'should have the default postfix': Test.testPostfixSync('.tmp'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the default postfix': Test.testPostfixSync('.tmp')
   },
 
   'when using with prefix': {
@@ -54,8 +53,7 @@ vows.describe('Synchronous file creation').addBatch({
 
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100600, true),
-    'should have the provided prefix': Test.testPrefixSync('something'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided prefix': Test.testPrefixSync('something')
   },
 
   'when using with postfix': {
@@ -65,8 +63,7 @@ vows.describe('Synchronous file creation').addBatch({
 
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100600, true),
-    'should have the provided postfix': Test.testPostfixSync('.txt'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('.txt')
   },
 
   'when using template': {
@@ -77,21 +74,20 @@ vows.describe('Synchronous file creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100600, true),
     'should have the provided prefix': Test.testPrefixSync('clike-'),
-    'should have the provided postfix': Test.testPostfixSync('-postfix'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('-postfix')
   },
 
   'when using name': {
     topic: function () {
-      return tmp.fileSync({ name: 'using-name' });
+      return tmp.fileSync({ name: 'using-name-sync.tmp' });
     },
 
     'should return with a name': Test.assertNameSync,
-    'should have the provided name': Test.testNameSync(path.join(tmp.tmpdir, 'using-name')),
+    'should have the provided name': Test.testNameSync(path.join(tmp.tmpdir, 'using-name-sync.tmp')),
     'should be a file': function (result) {
       _testFile(0100600, true);
-    },
-    'should have been cleaned up': Test.testCleanupSync
+      fs.unlinkSync(result.name);
+    }
   },
 
   'when using multiple options': {
@@ -102,8 +98,7 @@ vows.describe('Synchronous file creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100640, true),
     'should have the provided prefix': Test.testPrefixSync('foo'),
-    'should have the provided postfix': Test.testPostfixSync('bar'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('bar')
   },
 
   'when using multiple options and mode': {
@@ -114,8 +109,7 @@ vows.describe('Synchronous file creation').addBatch({
     'should return with a name': Test.assertNameSync,
     'should be a file': _testFile(0100644, true),
     'should have the provided prefix': Test.testPrefixSync('complicated'),
-    'should have the provided postfix': Test.testPostfixSync('options'),
-    'should have been cleaned up': Test.testCleanupSync
+    'should have the provided postfix': Test.testPostfixSync('options')
   },
 
   'no tries': {

diff --git a/test/file-test.js b/test/file-test.js
@@ -73,8 +73,7 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100600, true),
     'should have the default prefix': Test.testPrefix('tmp-'),
-    'should have the default postfix': Test.testPostfix('.tmp'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the default postfix': Test.testPostfix('.tmp')
   },
 
   'when using with prefix': {
@@ -85,8 +84,7 @@ vows.describe('File creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100600, true),
-    'should have the provided prefix': Test.testPrefix('something'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided prefix': Test.testPrefix('something')
   },
 
   'when using with postfix': {
@@ -97,8 +95,7 @@ vows.describe('File creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100600, true),
-    'should have the provided postfix': Test.testPostfix('.txt'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('.txt')
   },
 
   'when using template': {
@@ -110,8 +107,7 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100600, true),
     'should have the provided prefix': Test.testPrefix('clike-'),
-    'should have the provided postfix': Test.testPostfix('-postfix'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('-postfix')
   },
 
   'when using name': {
@@ -125,8 +121,7 @@ vows.describe('File creation').addBatch({
     'should be a file': function (err, name) {
       _testFile(0100600, true);
       fs.unlinkSync(name);
-    },
-    'should have been cleaned up': Test.testCleanup
+    }
   },
 
   'when using discardDescriptor': {
@@ -138,7 +133,6 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should not return with a descriptor': Test.assertNoDescriptor,
     'should be a file': _testFileNoDescriptor(0100600),
-    'should have been cleaned up': Test.testCleanup
   },
 
   'when using detachDescriptor': {
@@ -153,7 +147,6 @@ vows.describe('File creation').addBatch({
     'should not return with an error': assert.isNull,
     'should return with a name': Test.assertName,
     'should have working descriptor after removeCallback': _testFileAfterDetachRemove(0100600),
-    'should have been cleaned up': Test.testCleanup
   },
 
   'when using multiple options': {
@@ -165,8 +158,7 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100640, true),
     'should have the provided prefix': Test.testPrefix('foo'),
-    'should have the provided postfix': Test.testPostfix('bar'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('bar')
   },
 
   'when using multiple options and mode': {
@@ -178,8 +170,7 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a file': _testFile(0100644, true),
     'should have the provided prefix': Test.testPrefix('complicated'),
-    'should have the provided postfix': Test.testPostfix('options'),
-    'should have been cleaned up': Test.testCleanup
+    'should have the provided postfix': Test.testPostfix('options')
   },
 
   'no tries': {
@@ -199,6 +190,7 @@ vows.describe('File creation').addBatch({
     'should return with a name': Test.assertName,
     'should be a file': function (err, name) {
       _testFile(0100600, false)(err, name, null);
+      fs.unlinkSync(name);
     }
   },