test: rewrite fs{f}utimes test file

Previously this test silently swallowed some errors. Refactored to use `common.mustCall()` & `assert()`s. Also, this adds a couple of extra error-checking cases. PR-URL: #25656 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: Fishrock123

test/parallel/test-fs-utimes.js

@@ -28,9 +28,6 @@ const fs = require('fs');
 consttmpdir=require('../common/tmpdir');
 tmpdir.refresh();
 
-lettests_ok=0;
-lettests_run=0;
-
 functionstat_resource(resource){
 if(typeofresource==='string'){
 returnfs.statSync(resource);
@@ -49,71 +46,46 @@ function check_mtime(resource, mtime){
 mtime=fs._toUnixTimestamp(mtime);
 conststats=stat_resource(resource);
 constreal_mtime=fs._toUnixTimestamp(stats.mtime);
-// check up to single-second precision
-// sub-second precision is OS and fs dependant
-returnmtime-real_mtime<2;
+returnmtime-real_mtime;
 }
 
 functionexpect_errno(syscall,resource,err,errno){
-if(err&&(err.code===errno||err.code==='ENOSYS')){
-tests_ok++;
-}else{
-console.log('FAILED:','expect_errno',util.inspect(arguments));
-}
+assert(
+err&&(err.code===errno||err.code==='ENOSYS'),
+`FAILED: expect_errno ${util.inspect(arguments)}`
+);
 }
 
 functionexpect_ok(syscall,resource,err,atime,mtime){
-if(!err&&check_mtime(resource,mtime)||
-err&&err.code==='ENOSYS'){
-tests_ok++;
-}else{
-console.log('FAILED:','expect_ok',util.inspect(arguments));
-}
+constmtime_diff=check_mtime(resource,mtime);
+assert(
+// check up to single-second precision
+// sub-second precision is OS and fs dependant
+!err&&(mtime_diff<2)||err&&err.code==='ENOSYS',
+`FAILED: expect_ok ${util.inspect(arguments)}
+ check_mtime: ${mtime_diff}`
+);
 }
 
-functiontestIt(atime,mtime,callback){
-
-letfd;
-//
-// test synchronized code paths, these functions throw on failure
-//
-functionsyncTests(){
-fs.utimesSync(tmpdir.path,atime,mtime);
-expect_ok('utimesSync',tmpdir.path,undefined,atime,mtime);
-tests_run++;
-
-// some systems don't have futimes
-// if there's an error, it should be ENOSYS
-try{
-tests_run++;
-fs.futimesSync(fd,atime,mtime);
-expect_ok('futimesSync',fd,undefined,atime,mtime);
-}catch(ex){
-expect_errno('futimesSync',fd,ex,'ENOSYS');
-}
-
-leterr;
-try{
-fs.utimesSync('foobarbaz',atime,mtime);
-}catch(ex){
-err=ex;
-}
-expect_errno('utimesSync','foobarbaz',err,'ENOENT');
-tests_run++;
+conststats=fs.statSync(tmpdir.path);
 
-err=undefined;
-common.expectsError(
-()=>fs.futimesSync(-1,atime,mtime),
-{
-code: 'ERR_OUT_OF_RANGE',
-type: RangeError,
-message: 'The value of "fd" is out of range. '+
-'It must be >= 0 && < 4294967296. Received -1'
-}
-);
-tests_run++;
-}
+constcases=[
+newDate('1982-09-10 13:37'),
+newDate(),
+123456.789,
+stats.mtime,
+['123456',-1],
+newDate('2017-04-08T17:59:38.008Z')
+];
+runTests(cases.values());
+
+functionrunTests(iter){
+const{ value, done }=iter.next();
+if(done)return;
+// Support easy setting same or different atime / mtime values
+const[atime,mtime]=Array.isArray(value) ? value : [value,value];
 
+letfd;
 //
 // test async code paths
 //
@@ -133,54 +105,40 @@ function testIt(atime, mtime, callback){
 fs.futimes(fd,atime,mtime,common.mustCall((err)=>{
 expect_ok('futimes',fd,err,atime,mtime);
 
-common.expectsError(
-()=>fs.futimes(-1,atime,mtime,common.mustNotCall()),
-{
-code: 'ERR_OUT_OF_RANGE',
-type: RangeError,
-message: 'The value of "fd" is out of range. '+
-'It must be >= 0 && < 4294967296. Received -1'
-}
-);
-
 syncTests();
 
-tests_run++;
+setImmediate(common.mustCall(runTests),iter);
 }));
-tests_run++;
 }));
-tests_run++;
 }));
-tests_run++;
-}
 
-conststats=fs.statSync(tmpdir.path);
+//
+// test synchronized code paths, these functions throw on failure
+//
+functionsyncTests(){
+fs.utimesSync(tmpdir.path,atime,mtime);
+expect_ok('utimesSync',tmpdir.path,undefined,atime,mtime);
 
-// Run tests
-construnTest=common.mustCall(testIt,1);
-
-runTest(newDate('1982-09-10 13:37'),newDate('1982-09-10 13:37'),()=>{
-runTest(newDate(),newDate(),()=>{
-runTest(123456.789,123456.789,()=>{
-runTest(stats.mtime,stats.mtime,()=>{
-runTest('123456',-1,()=>{
-runTest(
-newDate('2017-04-08T17:59:38.008Z'),
-newDate('2017-04-08T17:59:38.008Z'),
-common.mustCall(()=>{
-// Done
-})
-);
-});
-});
-});
-});
-});
+// some systems don't have futimes
+// if there's an error, it should be ENOSYS
+try{
+fs.futimesSync(fd,atime,mtime);
+expect_ok('futimesSync',fd,undefined,atime,mtime);
+}catch(ex){
+expect_errno('futimesSync',fd,ex,'ENOSYS');
+}
 
-process.on('exit',()=>{
-assert.strictEqual(tests_ok,tests_run-2);
-});
+leterr;
+try{
+fs.utimesSync('foobarbaz',atime,mtime);
+}catch(ex){
+err=ex;
+}
+expect_errno('utimesSync','foobarbaz',err,'ENOENT');
 
+err=undefined;
+}
+}
 
 // Ref: https://github.com/nodejs/node/issues/13255
 constpath=`${tmpdir.path}/test-utimes-precision`;
@@ -212,19 +170,56 @@ if (common.isWindows){
 assert.strictEqual(overflow_mtime,overflow_stats.mtime.getTime());
 }
 
-[false,0,{},[],null,undefined].forEach((i)=>{
+constexpectTypeError={
+code: 'ERR_INVALID_ARG_TYPE',
+type: TypeError
+};
+// utimes-only error cases
+{
+common.expectsError(
+()=>fs.utimes(0,newDate(),newDate(),common.mustNotCall()),
+expectTypeError
+);
+common.expectsError(
+()=>fs.utimesSync(0,newDate(),newDate()),
+expectTypeError
+);
+}
+
+// shared error cases
+[false,{},[],null,undefined].forEach((i)=>{
 common.expectsError(
 ()=>fs.utimes(i,newDate(),newDate(),common.mustNotCall()),
-{
-code: 'ERR_INVALID_ARG_TYPE',
-type: TypeError
-}
+expectTypeError
 );
 common.expectsError(
 ()=>fs.utimesSync(i,newDate(),newDate()),
-{
-code: 'ERR_INVALID_ARG_TYPE',
-type: TypeError
-}
+expectTypeError
+);
+common.expectsError(
+()=>fs.futimes(i,newDate(),newDate(),common.mustNotCall()),
+expectTypeError
+);
+common.expectsError(
+()=>fs.futimesSync(i,newDate(),newDate()),
+expectTypeError
 );
 });
+
+constexpectRangeError={
+code: 'ERR_OUT_OF_RANGE',
+type: RangeError,
+message: 'The value of "fd" is out of range. '+
+'It must be >= 0 && < 4294967296. Received -1'
+};
+// futimes-only error cases
+{
+common.expectsError(
+()=>fs.futimes(-1,newDate(),newDate(),common.mustNotCall()),
+expectRangeError
+);
+common.expectsError(
+()=>fs.futimesSync(-1,newDate(),newDate()),
+expectRangeError
+);
+}