1 files changed, 48 insertions, 35 deletions
diff --git a/test/parallel/test-ttywrap-invalid-fd.js b/test/parallel/test-ttywrap-invalid-fd.js
index 44647590cc..ad7a98da34 100644
--- a/test/parallel/test-ttywrap-invalid-fd.js
+++ b/test/parallel/test-ttywrap-invalid-fd.js
@@ -1,44 +1,57 @@
 'use strict';
 const common = require('../common');
-const assert = require('assert');
 const fs = require('fs');
 const tty = require('tty');
 
-assert.throws(() => {
-  new tty.WriteStream(-1);
-}, common.expectsError({
-  code: 'ERR_INVALID_FD',
-  type: RangeError,
-  message: '"fd" must be a positive integer: -1'
-})
+common.expectsError(
+  () => new tty.WriteStream(-1),
+  {
+    code: 'ERR_INVALID_FD',
+    type: RangeError,
+    message: '"fd" must be a positive integer: -1'
+  }
 );
 
-const err_regex = common.isWindows ?
-  /^Error: EBADF: bad file descriptor, uv_tty_init$/ :
-  /^Error: EINVAL: invalid argument, uv_tty_init$/;
-assert.throws(() => {
-  let fd = 2;
-  // Get first known bad file descriptor.
-  try {
-    while (fs.fstatSync(++fd));
-  } catch (e) { }
-  new tty.WriteStream(fd);
-}, err_regex);
+{
+  const message = common.isWindows ?
+    'bad file descriptor: EBADF [uv_tty_init]' :
+    'invalid argument: EINVAL [uv_tty_init]';
 
-assert.throws(() => {
-  new tty.ReadStream(-1);
-}, common.expectsError({
-  code: 'ERR_INVALID_FD',
-  type: RangeError,
-  message: '"fd" must be a positive integer: -1'
-})
-);
+  common.expectsError(
+    () => {
+      let fd = 2;
+      // Get first known bad file descriptor.
+      try {
+        while (fs.fstatSync(++fd));
+      } catch (e) { }
+      new tty.WriteStream(fd);
+    }, {
+      code: 'ERR_SYSTEM_ERROR',
+      type: Error,
+      message
+    }
+  );
+
+  common.expectsError(
+    () => {
+      let fd = 2;
+      // Get first known bad file descriptor.
+      try {
+        while (fs.fstatSync(++fd));
+      } catch (e) { }
+      new tty.ReadStream(fd);
+    }, {
+      code: 'ERR_SYSTEM_ERROR',
+      type: Error,
+      message
+    });
+}
 
-assert.throws(() => {
-  let fd = 2;
-  // Get first known bad file descriptor.
-  try {
-    while (fs.fstatSync(++fd));
-  } catch (e) { }
-  new tty.ReadStream(fd);
-}, err_regex);
+common.expectsError(
+  () => new tty.ReadStream(-1),
+  {
+    code: 'ERR_INVALID_FD',
+    type: RangeError,
+    message: '"fd" must be a positive integer: -1'
+  }
+);