test: use runWithInvalidFD() in tests expecting EBADF

PR-URL: #18864 Fixes: #18820 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
nodejs · Feb 22, 2018 · 5055c29 · 5055c29
1 parent acf2fd3
commit 5055c29
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 86 deletions.
diff --git a/test/parallel/test-fs-close-errors.js b/test/parallel/test-fs-close-errors.js
@@ -4,9 +4,7 @@
 // include the desired properties
 
 const common = require('../common');
-const assert = require('assert');
 const fs = require('fs');
-const uv = process.binding('uv');
 
 ['', false, null, undefined, {}, []].forEach((i) => {
   common.expectsError(
@@ -26,41 +24,3 @@ const uv = process.binding('uv');
     }
   );
 });
-
-{
-  assert.throws(
-    () => {
-      const fd = fs.openSync(__filename, 'r');
-      fs.closeSync(fd);
-      fs.closeSync(fd);
-    },
-    (err) => {
-      assert.strictEqual(err.code, 'EBADF');
-      assert.strictEqual(
-        err.message,
-        'EBADF: bad file descriptor, close'
-      );
-      assert.strictEqual(err.constructor, Error);
-      assert.strictEqual(err.syscall, 'close');
-      assert.strictEqual(err.errno, uv.UV_EBADF);
-      return true;
-    }
-  );
-}
-
-{
-  const fd = fs.openSync(__filename, 'r');
-  fs.close(fd, common.mustCall((err) => {
-    assert.ifError(err);
-    fs.close(fd, common.mustCall((err) => {
-      assert.strictEqual(err.code, 'EBADF');
-      assert.strictEqual(
-        err.message,
-        'EBADF: bad file descriptor, close'
-      );
-      assert.strictEqual(err.constructor, Error);
-      assert.strictEqual(err.syscall, 'close');
-      assert.strictEqual(err.errno, uv.UV_EBADF);
-    }));
-  }));
-}
diff --git a/test/parallel/test-fs-error-messages.js b/test/parallel/test-fs-error-messages.js
@@ -94,15 +94,14 @@ function re(literals, ...values) {
     return true;
   };
 
-  const fd = fs.openSync(existingFile, 'r');
-  fs.closeSync(fd);
-
-  fs.fstat(fd, common.mustCall(validateError));
-
-  assert.throws(
-    () => fs.fstatSync(fd),
-    validateError
-  );
+  common.runWithInvalidFD((fd) => {
+    fs.fstat(fd, common.mustCall(validateError));
+
+    assert.throws(
+      () => fs.fstatSync(fd),
+      validateError
+    );
+  });
 }
 
 // realpath
@@ -414,6 +413,27 @@ function re(literals, ...values) {
   );
 }
 
+
+// close
+{
+  const validateError = (err) => {
+    assert.strictEqual(err.message, 'EBADF: bad file descriptor, close');
+    assert.strictEqual(err.errno, uv.UV_EBADF);
+    assert.strictEqual(err.code, 'EBADF');
+    assert.strictEqual(err.syscall, 'close');
+    return true;
+  };
+
+  common.runWithInvalidFD((fd) => {
+    fs.close(fd, common.mustCall(validateError));
+
+    assert.throws(
+      () => fs.closeSync(fd),
+      validateError
+    );
+  });
+}
+
 // readFile
 {
   const validateError = (err) => {
@@ -472,15 +492,14 @@ function re(literals, ...values) {
     return true;
   };
 
-  const fd = fs.openSync(existingFile, 'r');
-  fs.closeSync(fd);
+  common.runWithInvalidFD((fd) => {
+    fs.ftruncate(fd, 4, common.mustCall(validateError));
 
-  fs.ftruncate(fd, 4, common.mustCall(validateError));
-
-  assert.throws(
-    () => fs.ftruncateSync(fd, 4),
-    validateError
-  );
+    assert.throws(
+      () => fs.ftruncateSync(fd, 4),
+      validateError
+    );
+  });
 }
 
 // fdatasync
@@ -493,15 +512,14 @@ function re(literals, ...values) {
     return true;
   };
 
-  const fd = fs.openSync(existingFile, 'r');
-  fs.closeSync(fd);
-
-  fs.fdatasync(fd, common.mustCall(validateError));
+  common.runWithInvalidFD((fd) => {
+    fs.fdatasync(fd, common.mustCall(validateError));
 
-  assert.throws(
-    () => fs.fdatasyncSync(fd),
-    validateError
-  );
+    assert.throws(
+      () => fs.fdatasyncSync(fd),
+      validateError
+    );
+  });
 }
 
 // fsync
@@ -514,13 +532,12 @@ function re(literals, ...values) {
     return true;
   };
 
-  const fd = fs.openSync(existingFile, 'r');
-  fs.closeSync(fd);
-
-  fs.fsync(fd, common.mustCall(validateError));
+  common.runWithInvalidFD((fd) => {
+    fs.fsync(fd, common.mustCall(validateError));
 
-  assert.throws(
-    () => fs.fsyncSync(fd),
-    validateError
-  );
+    assert.throws(
+      () => fs.fsyncSync(fd),
+      validateError
+    );
+  });
 }
diff --git a/test/parallel/test-ttywrap-invalid-fd.js b/test/parallel/test-ttywrap-invalid-fd.js
@@ -2,7 +2,6 @@
 // Flags: --expose-internals
 
 const common = require('../common');
-const fs = require('fs');
 const tty = require('tty');
 const { SystemError } = require('internal/errors');
 
@@ -22,12 +21,9 @@ common.expectsError(
 
   common.expectsError(
     () => {
-      let fd = 2;
-      // Get first known bad file descriptor.
-      try {
-        while (fs.fstatSync(++fd));
-      } catch (e) { }
-      new tty.WriteStream(fd);
+      common.runWithInvalidFD((fd) => {
+        new tty.WriteStream(fd);
+      });
     }, {
       code: 'ERR_SYSTEM_ERROR',
       type: SystemError,
@@ -37,12 +33,9 @@ common.expectsError(
 
   common.expectsError(
     () => {
-      let fd = 2;
-      // Get first known bad file descriptor.
-      try {
-        while (fs.fstatSync(++fd));
-      } catch (e) { }
-      new tty.ReadStream(fd);
+      common.runWithInvalidFD((fd) => {
+        new tty.ReadStream(fd);
+      });
     }, {
       code: 'ERR_SYSTEM_ERROR',
       type: SystemError,