fixup! benchmark: fix race condition on fs benchs

benchmark/fs/readfile-partitioned.js

@@ -35,17 +35,17 @@ function main({ len, duration, concurrent, encoding }) {
   const zipData = Buffer.alloc(1024, 'a');
 
   let waitConcurrent = 0;
-  // plus one because of zip
-  let targetConcurrency = concurrent + 1;
 
+  // Plus one because of zip
+  const targetConcurrency = concurrent + 1;
   const startedAt = Date.now();
   const endAt = startedAt + (duration * 1000);
 
   let reads = 0;
   let zips = 0;
 
   bench.start();
-  
+
   function stop() {
     const totalOps = reads + zips;
     bench.end(totalOps);
@@ -70,7 +70,7 @@ function main({ len, duration, concurrent, encoding }) {
       throw new Error('wrong number of bytes returned');
 
     reads++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === targetConcurrency) {
       stop();
@@ -88,7 +88,7 @@ function main({ len, duration, concurrent, encoding }) {
       throw er;
 
     zips++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === targetConcurrency) {
       stop();

benchmark/fs/readfile-permission-enabled.js

@@ -5,7 +5,6 @@
 
 const common = require('../common.js');
 const fs = require('fs');
-const assert = require('assert');
 
 const tmpdir = require('../../test/common/tmpdir');
 tmpdir.refresh();
@@ -42,7 +41,7 @@ function main({ len, duration, concurrent, encoding }) {
   const endAt = startedAt + (duration * 1000);
 
   bench.start();
-  
+
   function stop() {
     bench.end(reads);
 
@@ -68,7 +67,7 @@ function main({ len, duration, concurrent, encoding }) {
       throw new Error('wrong number of bytes returned');
 
     reads++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === concurrent) {
       stop();

benchmark/fs/readfile-promises.js

@@ -5,7 +5,6 @@
 
 const common = require('../common.js');
 const fs = require('fs');
-const assert = require('assert');
 
 const tmpdir = require('../../test/common/tmpdir');
 tmpdir.refresh();
@@ -70,7 +69,7 @@ function main({ len, duration, concurrent, encoding }) {
       throw new Error('wrong number of bytes returned');
 
     reads++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === concurrent) {
       stop();

benchmark/fs/readfile.js

@@ -5,8 +5,6 @@
 
 const common = require('../common.js');
 const fs = require('fs');
-const assert = require('assert');
-const { performance } = require('perf_hooks');
 
 const tmpdir = require('../../test/common/tmpdir');
 tmpdir.refresh();
@@ -62,7 +60,7 @@ function main({ len, duration, concurrent, encoding }) {
       throw new Error('wrong number of bytes returned');
 
     reads++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === concurrent) {
       stop();

benchmark/fs/writefile-promises.js

@@ -5,7 +5,6 @@
 
 const common = require('../common.js');
 const fs = require('fs');
-const assert = require('assert');
 const tmpdir = require('../../test/common/tmpdir');
 
 tmpdir.refresh();
@@ -44,7 +43,7 @@ function main({ encodingType, duration, concurrent, size }) {
   const endAt = startedAt + (duration * 1000);
 
   bench.start();
-  
+
   function stop() {
     bench.end(writes);
 
@@ -67,16 +66,11 @@ function main({ encodingType, duration, concurrent, size }) {
 
   function afterWrite(er) {
     if (er) {
-      if (er.code === 'ENOENT') {
-        // Only OK if unlinked by the timer from main.
-        assert.ok(benchEnded);
-        return;
-      }
       throw er;
     }
 
     writes++;
-    let benchEnded = Date.now() >= endAt;
+    const benchEnded = Date.now() >= endAt;
 
     if (benchEnded && (++waitConcurrent) === concurrent) {
       stop();