test: use common.isWindows consistently

In the tests, we use "process.platform === 'win32'" in some places.
This patch replaces them with the "common.isWindows" for consistency.

PR-URL: #2269
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>

Author: thefourtheye

test/common.js

@@ -119,7 +119,7 @@ Object.defineProperty(exports, 'opensslCli', {get: function() {
     opensslCli = path.join(path.dirname(process.execPath), 'openssl-cli');
   }
 
-  if (process.platform === 'win32') opensslCli += '.exe';
+  if (exports.isWindows) opensslCli += '.exe';
 
   var openssl_cmd = child_process.spawnSync(opensslCli, ['version']);
   if (openssl_cmd.status !== 0 || openssl_cmd.error !== undefined) {
@@ -133,7 +133,7 @@ Object.defineProperty(exports, 'hasCrypto', {get: function() {
   return process.versions.openssl ? true : false;
 }});
 
-if (process.platform === 'win32') {
+if (exports.isWindows) {
   exports.PIPE = '\\\\.\\pipe\\libuv-test';
 } else {
   exports.PIPE = exports.tmpDir + '/test.sock';
@@ -150,7 +150,7 @@ if (process.env.NODE_COMMON_PIPE) {
   }
 }
 
-if (process.platform === 'win32') {
+if (exports.isWindows) {
   exports.faketimeCli = false;
 } else {
   exports.faketimeCli = path.join(__dirname, '..', 'tools', 'faketime', 'src',
@@ -183,7 +183,7 @@ exports.indirectInstanceOf = function(obj, cls) {
 
 
 exports.ddCommand = function(filename, kilobytes) {
-  if (process.platform === 'win32') {
+  if (exports.isWindows) {
     var p = path.resolve(exports.fixturesDir, 'create-file.js');
     return '"' + process.argv[0] + '" "' + p + '" "' +
            filename + '" ' + (kilobytes * 1024);
@@ -196,7 +196,7 @@ exports.ddCommand = function(filename, kilobytes) {
 exports.spawnCat = function(options) {
   var spawn = require('child_process').spawn;
 
-  if (process.platform === 'win32') {
+  if (exports.isWindows) {
     return spawn('more', [], options);
   } else {
     return spawn('cat', [], options);
@@ -207,7 +207,7 @@ exports.spawnCat = function(options) {
 exports.spawnSyncCat = function(options) {
   var spawnSync = require('child_process').spawnSync;
 
-  if (process.platform === 'win32') {
+  if (exports.isWindows) {
     return spawnSync('more', [], options);
   } else {
     return spawnSync('cat', [], options);
@@ -218,7 +218,7 @@ exports.spawnSyncCat = function(options) {
 exports.spawnPwd = function(options) {
   var spawn = require('child_process').spawn;
 
-  if (process.platform === 'win32') {
+  if (exports.isWindows) {
     return spawn('cmd.exe', ['/c', 'cd'], options);
   } else {
     return spawn('pwd', [], options);
@@ -374,7 +374,7 @@ exports.checkSpawnSyncRet = function(ret) {
 };
 
 var etcServicesFileName = path.join('/etc', 'services');
-if (process.platform === 'win32') {
+if (exports.isWindows) {
   etcServicesFileName = path.join(process.env.SystemRoot, 'System32', 'drivers',
     'etc', 'services');
 }

test/parallel/test-c-ares.js

@@ -30,7 +30,7 @@ assert.throws(function() {
 // Windows doesn't usually have an entry for localhost 127.0.0.1 in
 // C:\Windows\System32\drivers\etc\hosts
 // so we disable this test on Windows.
-if (process.platform != 'win32') {
+if (!common.isWindows) {
   dns.resolve('127.0.0.1', 'PTR', function(error, domains) {
     if (error) throw error;
     assert.ok(Array.isArray(domains));

test/parallel/test-child-process-cwd.js

@@ -38,7 +38,7 @@ function testCwd(options, forCode, forData) {
 }
 
 // Assume these exist, and 'pwd' gives us the right directory back
-if (process.platform == 'win32') {
+if (common.isWindows) {
   testCwd({cwd: process.env.windir}, 0, process.env.windir);
   testCwd({cwd: 'c:\\'}, 0, 'c:\\');
 } else {

test/parallel/test-child-process-default-options.js

@@ -4,11 +4,9 @@ var assert = require('assert');
 
 var spawn = require('child_process').spawn;
 
-var isWindows = process.platform === 'win32';
-
 process.env.HELLO = 'WORLD';
 
-if (isWindows) {
+if (common.isWindows) {
   var child = spawn('cmd.exe', ['/c', 'set'], {});
 } else {
   var child = spawn('/usr/bin/env', [], {});

test/parallel/test-child-process-double-pipe.js

@@ -1,6 +1,4 @@
 'use strict';
-var is_windows = process.platform === 'win32';
-
 var common = require('../common');
 var assert = require('assert'),
     os = require('os'),
@@ -12,7 +10,7 @@ var assert = require('assert'),
 
 var grep, sed, echo;
 
-if (is_windows) {
+if (common.isWindows) {
   grep = spawn('grep', ['--binary', 'o']),
   sed = spawn('sed', ['--binary', 's/o/O/']),
   echo = spawn('cmd.exe',

test/parallel/test-child-process-env.js

@@ -4,16 +4,14 @@ var assert = require('assert');
 
 var spawn = require('child_process').spawn;
 
-var isWindows = process.platform === 'win32';
-
 var env = {
   'HELLO': 'WORLD'
 };
 env.__proto__ = {
   'FOO': 'BAR'
 };
 
-if (isWindows) {
+if (common.isWindows) {
   var child = spawn('cmd.exe', ['/c', 'set'], {env: env});
 } else {
   var child = spawn('/usr/bin/env', [], {env: env});

test/parallel/test-child-process-exec-cwd.js

@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+const common = require('../common');
 var assert = require('assert');
 var exec = require('child_process').exec;
 
@@ -8,7 +8,7 @@ var error_count = 0;
 
 var pwdcommand, dir;
 
-if (process.platform == 'win32') {
+if (common.isWindows) {
   pwdcommand = 'echo %cd%';
   dir = 'c:\\windows';
 } else {

test/parallel/test-child-process-exec-env.js

@@ -20,7 +20,7 @@ function after(err, stdout, stderr) {
   }
 }
 
-if (process.platform !== 'win32') {
+if (!common.isWindows) {
   child = exec('/usr/bin/env', { env: { 'HELLO': 'WORLD' } }, after);
 } else {
   child = exec('set', { env: { 'HELLO': 'WORLD' } }, after);

test/parallel/test-child-process-exec-error.js

@@ -17,7 +17,7 @@ function test(fun, code) {
   });
 }
 
-if (process.platform === 'win32') {
+if (common.isWindows) {
   test(child_process.exec, 1); // exit code of cmd.exe
 } else {
   test(child_process.exec, 127); // exit code of /bin/sh

test/parallel/test-child-process-fork-dgram.js

@@ -18,7 +18,7 @@ var fork = require('child_process').fork;
 var assert = require('assert');
 var common = require('../common');
 
-if (process.platform === 'win32') {
+if (common.isWindows) {
   console.error('Sending dgram sockets to child processes not supported');
   process.exit(0);
 }