Merge pull request #111 from binki/windows-tests

raszi · web-flow · commit 42cd5f7c4044 · 2017-01-31T10:10:21.000+01:00
Windows tests
diff --git a/test/base.js b/test/base.js
@@ -1,12 +1,24 @@
 var
   assert = require('assert'),
   path   = require('path'),
-  exec   = require('child_process').exec,
+  spawn   = require('child_process').spawn,
   tmp    = require('../lib/tmp');
 
 // make sure that we do not test spam the global tmp
 tmp.TMP_DIR = './tmp';
 
+function _bufferConcat(buffers) {
+  if (Buffer.concat) {
+    return Buffer.concat.apply(this, arguments);
+  } else {
+    return new Buffer(buffers.reduce(function (acc, buf) {
+      for (var i = 0; i < buf.length; i++) {
+        acc.push(buf[i]);
+      }
+      return acc;
+    }, []));
+  }
+}
 
 function _spawnTestWithError(testFile, params, cb) {
   _spawnTest(true, testFile, params, cb);
@@ -19,25 +31,71 @@ function _spawnTestWithoutError(testFile, params, cb) {
 function _spawnTest(passError, testFile, params, cb) {
   var
     node_path = process.argv[0],
-    command = [ node_path, path.join(__dirname, testFile) ].concat(params).join(' ');
-
-  exec(command, function _execDone(err, stdout, stderr) {
-    if (passError) {
-      if (err) {
-        return cb(err);
-      } else if (stderr.length > 0) {
-        return cb(stderr.toString());
+    command_args = [ path.join(__dirname, testFile) ].concat(params),
+    stdoutBufs = [],
+    stderrBufs = [],
+    child,
+    done = false,
+    stderrDone = false,
+    stdoutDone = false;
+
+  // spawn doesn’t have the quoting problems that exec does,
+  // especially when going for Windows portability.
+  child = spawn(node_path, command_args);
+  child.stdin.end();
+  // Cannot use 'close' event because not on node-0.6.
+  function _close() {
+    var
+      stderr = _bufferConcat(stderrBufs),
+      stdout = _bufferConcat(stdoutBufs);
+    if (stderrDone && stdoutDone && !done) {
+      done = true;
+      if (passError) {
+        if (stderr.length > 0) {
+          return cb(stderr.toString());
+        }
       }
+      return cb(null, _bufferConcat(stdoutBufs).toString());
     }
-
-    return cb(null, stdout.toString());
+  }
+  if (passError) {
+    child.on('error', function _spawnError(err) {
+      if (!done) {
+        done = true;
+        cb(err);
+      }
+    });
+  }
+  child.stdout.on('data', function _stdoutData(data) {
+    stdoutBufs.push(data);
+  }).on('close', function _stdoutEnd() {
+    stdoutDone = true;
+    _close();
+  });
+  child.stderr.on('data', function _stderrData(data) {
+    stderrBufs.push(data);
+  }).on('close', function _stderrEnd() {
+    stderrDone = true;
+    _close();
   });
 }
 
 function _testStat(stat, mode) {
-  assert.equal(stat.uid, process.getuid(), 'should have the same UID');
-  assert.equal(stat.gid, process.getgid(), 'should have the same GUID');
-  assert.equal(stat.mode, mode);
+  // getuid() and getgid() do not exist on Windows.
+  if (process.getuid) {
+    assert.equal(stat.uid, process.getuid(), 'should have the same UID');
+  }
+  if (process.getgid) {
+    assert.equal(stat.gid, process.getgid(), 'should have the same GUID');
+  }
+  // mode values do not work properly on Windows. Ignore “group” and
+  // “other” bits then. Ignore execute bit on that platform because it
+  // doesn’t exist—even for directories.
+  if (process.platform == 'win32') {
+    assert.equal(stat.mode & 0666600, mode & 0666600);
+  } else {
+    assert.equal(stat.mode, mode);
+  }
 }
 
 function _testPrefix(prefix) {
diff --git a/test/file-sync-test.js b/test/file-sync-test.js
@@ -79,11 +79,11 @@ vows.describe('Synchronous file creation').addBatch({
 
   'when using name': {
     topic: function () {
-      return tmp.fileSync({ name: 'using-name.tmp' });
+      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.tmp')),
+    'should have the provided name': Test.testNameSync(path.join(tmp.tmpdir, 'using-name-sync.tmp')),
     'should be a file': function (result) {
       _testFile(0100600, true);
       fs.unlinkSync(result.name);
diff --git a/test/unsafe-sync.js b/test/unsafe-sync.js
@@ -18,7 +18,13 @@ try {
     var symlinkTarget = join(result.name, 'symlinkme-target');
 
     // symlink that should be removed but the contents should be preserved.
-    fs.symlinkSync(symlinkSource, symlinkTarget, 'dir');
+    // Skip on Windows because symlinks require elevated privileges (instead just
+    // create the file so that tdir-sync-test.js can unlink it).
+    if (process.platform == 'win32') {
+      fs.writeFileSync(symlinkTarget);
+    } else {
+      fs.symlinkSync(symlinkSource, symlinkTarget, 'dir');
+    }
 
     spawn.out(result.name, spawn.exit);
   } catch (e) {
diff --git a/test/unsafe.js b/test/unsafe.js
@@ -21,7 +21,13 @@ spawn.tmpFunction({ unsafeCleanup: unsafe }, function (err, name) {
     var symlinkTarget = join(name, 'symlinkme-target');
 
     // symlink that should be removed but the contents should be preserved.
-    fs.symlinkSync(symlinkSource, symlinkTarget, 'dir');
+    // Skip on Windows because symlinks require elevated privileges (instead just
+    // create the file so that tdir-sync-test.js can unlink it).
+    if (process.platform == 'win32') {
+      fs.writeFileSync(symlinkTarget);
+    } else {
+      fs.symlinkSync(symlinkSource, symlinkTarget, 'dir');
+    }
 
     spawn.out(name, spawn.exit);
   } catch (e) {
