Fix: When testing utime-related cases, check fs.futimes() args inst…

…ead of `fs.lstats().mtime` (fixes #208)
gulpjs · Jul 6, 2017 · a68fac1 · a68fac1
1 parent 7876d5e
commit a68fac1
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 30 deletions.
diff --git a/test/dest-times.js b/test/dest-times.js
@@ -68,8 +68,8 @@ describe('.dest() with custom times', function() {
       return;
     }
 
-    // Use the mtime of this file to have proper resolution
-    var mtime = fs.statSync(__filename).mtime;
+    // Use new mtime
+    var mtime = new Date(Date.now() - 2048);
 
     var futimesSpy = expect.spyOn(fs, 'futimes').andCallThrough();
 
@@ -83,10 +83,14 @@ describe('.dest() with custom times', function() {
     });
 
     function assert() {
-      var stats = fs.lstatSync(outputPath);
-
       expect(futimesSpy.calls.length).toEqual(1);
-      expect(stats.mtime.getTime()).toEqual(mtime.getTime());
+
+      // Compare args instead of fs.lstats(), since mtime may be drifted in x86 Node.js
+      var mtimeSpy = futimesSpy.calls[0].arguments[2];
+
+      expect(mtimeSpy.getTime())
+        .toEqual(mtime.getTime());
+
       expect(file.stat.mtime).toEqual(mtime);
     }
 
@@ -136,8 +140,8 @@ describe('.dest() with custom times', function() {
       return;
     }
 
-    // Use the mtime of this file to have proper resolution
-    var mtime = fs.lstatSync(__filename).mtime;
+    // Use new mtime
+    var mtime = new Date(Date.now() - 2048);
     var invalidAtime = new Date(undefined);
 
     var futimesSpy = expect.spyOn(fs, 'futimes').andCallThrough();
@@ -153,10 +157,11 @@ describe('.dest() with custom times', function() {
     });
 
     function assert() {
-      var stats = fs.lstatSync(outputPath);
-
       expect(futimesSpy.calls.length).toEqual(1);
-      expect(stats.mtime.getTime()).toEqual(mtime.getTime());
+
+      var mtimeSpy = futimesSpy.calls[0].arguments[2];
+
+      expect(mtimeSpy.getTime()).toEqual(mtime.getTime());
     }
 
     pipe([
@@ -172,9 +177,11 @@ describe('.dest() with custom times', function() {
       return;
     }
 
-    // Use the atime/mtime of this file to have proper resolution
-    var atime = fs.lstatSync(__filename).atime;
-    var mtime = fs.lstatSync(__filename).mtime;
+    // Use new atime/mtime
+    var atime = new Date(Date.now() - 2048);
+    var mtime = new Date(Date.now() - 1024);
+
+    var futimesSpy = expect.spyOn(fs, 'futimes').andCallThrough();
 
     var file = new File({
       base: inputBase,
@@ -187,10 +194,13 @@ describe('.dest() with custom times', function() {
     });
 
     function assert() {
-      var stats = fs.lstatSync(outputPath);
+      expect(futimesSpy.calls.length).toEqual(1);
+
+      var atimeSpy = futimesSpy.calls[0].arguments[1];
+      var mtimeSpy = futimesSpy.calls[0].arguments[2];
 
-      expect(stats.atime.getTime()).toEqual(atime.getTime());
-      expect(stats.mtime.getTime()).toEqual(mtime.getTime());
+      expect(atimeSpy.getTime()).toEqual(atime.getTime());
+      expect(mtimeSpy.getTime()).toEqual(mtime.getTime());
       expect(file.stat.mtime).toEqual(mtime);
       expect(file.stat.atime).toEqual(atime);
     };

diff --git a/test/file-operations.js b/test/file-operations.js
@@ -1030,10 +1030,9 @@ describe('updateMetadata', function() {
 
     var futimesSpy = expect.spyOn(fs, 'futimes').andCallThrough();
 
-    // Use the mtime/atime of this file to have proper resolution
-    var stats = fs.statSync(__filename);
-    var mtime = stats.mtime;
-    var atime = stats.atime;
+    // Use new atime/mtime
+    var atime = new Date(Date.now() - 2048);
+    var mtime = new Date(Date.now() - 1024);
     var mtimeEarlier = mtime.getTime() - 1000;
     var atimeEarlier = atime.getTime() - 1000;
 
@@ -1051,12 +1050,15 @@ describe('updateMetadata', function() {
 
     updateMetadata(fd, file, function() {
       expect(futimesSpy.calls.length).toEqual(1);
-      var stats = fs.fstatSync(fd);
+      // Var stats = fs.fstatSync(fd);
+
+      var atimeSpy = futimesSpy.calls[0].arguments[1];
+      var mtimeSpy = futimesSpy.calls[0].arguments[2];
 
       expect(file.stat.mtime).toEqual(new Date(mtimeEarlier));
-      expect(stats.mtime.getTime()).toEqual(mtimeEarlier);
+      expect(mtimeSpy.getTime()).toEqual(mtimeEarlier);
       expect(file.stat.atime).toEqual(new Date(atimeEarlier));
-      expect(stats.atime.getTime()).toEqual(atimeEarlier);
+      expect(atimeSpy.getTime()).toEqual(atimeEarlier);
 
       fs.close(fd, done);
     });
@@ -1193,10 +1195,9 @@ describe('updateMetadata', function() {
     var fchmodSpy = expect.spyOn(fs, 'fchmod').andCallThrough();
     var futimesSpy = expect.spyOn(fs, 'futimes').andCallThrough();
 
-    // Use the mtime/atime of this file to have proper resolution
-    var stats = fs.statSync(__filename);
-    var mtime = stats.mtime;
-    var atime = stats.atime;
+    // Use new atime/mtime
+    var atime = new Date(Date.now() - 2048);
+    var mtime = new Date(Date.now() - 1024);
     var mtimeEarlier = mtime.getTime() - 1000;
     var atimeEarlier = atime.getTime() - 1000;
 
@@ -1219,12 +1220,13 @@ describe('updateMetadata', function() {
       expect(fchmodSpy.calls.length).toEqual(1);
       expect(futimesSpy.calls.length).toEqual(1);
 
-      var stats = fs.fstatSync(fd);
+      var atimeSpy = futimesSpy.calls[0].arguments[1];
+      var mtimeSpy = futimesSpy.calls[0].arguments[2];
 
       expect(file.stat.mtime).toEqual(new Date(mtimeEarlier));
-      expect(stats.mtime.getTime()).toEqual(mtimeEarlier);
+      expect(mtimeSpy.getTime()).toEqual(mtimeEarlier);
       expect(file.stat.atime).toEqual(new Date(atimeEarlier));
-      expect(stats.atime.getTime()).toEqual(atimeEarlier);
+      expect(atimeSpy.getTime()).toEqual(atimeEarlier);
 
       fs.close(fd, done);
     });