test: update a few test scripts to work on OpenBSD

nodejs · Feb 3, 2018 · 455dc60 · 455dc60
1 parent 13192a9
commit 455dc60
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/test/common/index.js b/test/common/index.js
@@ -55,6 +55,7 @@ exports.isLinuxPPCBE = (process.platform === 'linux') &&
                        (os.endianness() === 'BE');
 exports.isSunOS = process.platform === 'sunos';
 exports.isFreeBSD = process.platform === 'freebsd';
+exports.isOpenBSD = process.platform === 'openbsd';
 exports.isLinux = process.platform === 'linux';
 exports.isOSX = process.platform === 'darwin';
 

diff --git a/test/parallel/test-child-process-exec-timeout.js b/test/parallel/test-child-process-exec-timeout.js
@@ -17,14 +17,18 @@ const cmd = `"${process.execPath}" "${__filename}" child`;
 // Test the case where a timeout is set, and it expires.
 cp.exec(cmd, { timeout: 1 }, common.mustCall((err, stdout, stderr) => {
   assert.strictEqual(err.killed, true);
-  assert.strictEqual(err.code, null);
+  // TODO OpenBSD returns a null code
+  if (!common.isOpenBSD)
+    assert.strictEqual(err.code, null);
+  else
+    sigterm = null;
   // At least starting with Darwin Kernel Version 16.4.0, sending a SIGTERM to a
   // process that is still starting up kills it with SIGKILL instead of SIGTERM.
   // See: https://github.com/libuv/libuv/issues/1226
   if (common.isOSX)
     assert.ok(err.signal === 'SIGTERM' || err.signal === 'SIGKILL');
   else
-    assert.strictEqual(err.signal, 'SIGTERM');
+    assert.strictEqual(err.signal, sigterm);
   assert.strictEqual(err.cmd, cmd);
   assert.strictEqual(stdout.trim(), '');
   assert.strictEqual(stderr.trim(), '');

diff --git a/test/parallel/test-child-process-spawnsync-validation-errors.js b/test/parallel/test-child-process-spawnsync-validation-errors.js
@@ -5,13 +5,17 @@ const spawnSync = require('child_process').spawnSync;
 const signals = process.binding('constants').os.signals;
 
 let invalidArgTypeError;
+let errCode = 56;
+if (common.isOpenBSD)
+  errCode = 46;
 
 if (common.isWindows) {
   invalidArgTypeError =
     common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, 36);
 } else {
   invalidArgTypeError =
-    common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError }, 56);
+    common.expectsError({ code: 'ERR_INVALID_ARG_TYPE', type: TypeError },
+                        errCode);
 }
 
 const invalidRangeError =

diff --git a/test/parallel/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
@@ -178,8 +178,8 @@ process.on('exit', function() {
 const path = `${tmpdir.path}/test-utimes-precision`;
 fs.writeFileSync(path, '');
 
-// test Y2K38 for all platforms [except 'arm', and 'SunOS']
-if (!process.arch.includes('arm') && !common.isSunOS) {
+// test Y2K38 for all platforms [except 'arm', 'OpenBSD' and 'SunOS']
+if (!process.arch.includes('arm') && !common.isOpenBSD && !common.isSunOS) {
   // because 2 ** 31 doesn't look right
   // eslint-disable-next-line space-infix-ops
   const Y2K38_mtime = 2**31;

diff --git a/test/parallel/test-http-dns-error.js b/test/parallel/test-http-dns-error.js
@@ -32,6 +32,10 @@ const https = require('https');
 const host = '*'.repeat(256);
 const MAX_TRIES = 5;
 
+let errCode = 'ENOTFOUND';
+if (common.isOpenBSD)
+  errCode = 'EAI_FAIL';
+
 function tryGet(mod, tries) {
   // Bad host name should not throw an uncatchable exception.
   // Ensure that there is time to attach an error listener.
@@ -41,7 +45,7 @@ function tryGet(mod, tries) {
       tryGet(mod, ++tries);
       return;
     }
-    assert.strictEqual(err.code, 'ENOTFOUND');
+    assert.strictEqual(err.code, errCode);
   }));
   // http.get() called req1.end() for us
 }
@@ -57,7 +61,7 @@ function tryRequest(mod, tries) {
       tryRequest(mod, ++tries);
       return;
     }
-    assert.strictEqual(err.code, 'ENOTFOUND');
+    assert.strictEqual(err.code, errCode);
   }));
   req.end();
 }

diff --git a/test/parallel/test-net-dns-error.js b/test/parallel/test-net-dns-error.js
@@ -27,17 +27,21 @@ const net = require('net');
 
 const host = '*'.repeat(256);
 
+let errCode = 'ENOTFOUND';
+if (common.isOpenBSD)
+  errCode = 'EAI_FAIL';
+
 function do_not_call() {
   throw new Error('This function should not have been called.');
 }
 
 const socket = net.connect(42, host, do_not_call);
 socket.on('error', common.mustCall(function(err) {
-  assert.strictEqual(err.code, 'ENOTFOUND');
+  assert.strictEqual(err.code, errCode);
 }));
 socket.on('lookup', function(err, ip, type) {
   assert(err instanceof Error);
-  assert.strictEqual(err.code, 'ENOTFOUND');
+  assert.strictEqual(err.code, errCode);
   assert.strictEqual(ip, undefined);
   assert.strictEqual(type, undefined);
 });
diff --git a/test/parallel/test-setproctitle.js b/test/parallel/test-setproctitle.js
@@ -34,7 +34,7 @@ exec(cmd, common.mustCall((error, stdout, stderr) => {
   assert.strictEqual(stderr, '');
 
   // freebsd always add ' (procname)' to the process title
-  if (common.isFreeBSD)
+  if (common.isFreeBSD || common.isOpenBSD)
     title += ` (${path.basename(process.execPath)})`;
 
   // omitting trailing whitespace and \n