fs: make unwatchFile() insensitive to path

diff --git a/lib/fs.js b/lib/fs.js
index 14ca77bdb2e8b3d4ee6fa3ae93d1ce19e10162be..b7d47ed3a4d89ba2b1c6a7a4eadac5332bdb0320 100644 (file)
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -1131,6 +1131,7 @@ function inStatWatchers(filename) {
 
 fs.watchFile = function(filename) {
   nullCheck(filename);
+  filename = pathModule.resolve(filename);
   var stat;
   var listener;
 
@@ -1165,6 +1166,7 @@ fs.watchFile = function(filename) {
 
 fs.unwatchFile = function(filename, listener) {
   nullCheck(filename);
+  filename = pathModule.resolve(filename);
   if (!inStatWatchers(filename)) return;
 
   var stat = statWatchers[filename];

diff --git a/test/pummel/test-fs-watch-file.js b/test/pummel/test-fs-watch-file.js
index 4dddb257ee29dbd8dc3e07855c0d96538dd6fa0d..3e8a17a4b8b23144bcf99d68dbdcab7ae8a23bb9 100644 (file)
--- a/test/pummel/test-fs-watch-file.js
+++ b/test/pummel/test-fs-watch-file.js
@@ -27,6 +27,7 @@ var fs = require('fs');
 var watchSeenOne = 0;
 var watchSeenTwo = 0;
 var watchSeenThree = 0;
+var watchSeenFour = 0;
 
 var startDir = process.cwd();
 var testDir = common.tmpDir;
@@ -40,14 +41,17 @@ var filepathTwoAbs = path.join(testDir, filenameTwo);
 
 var filenameThree = 'charm'; // because the third time is
 
+var filenameFour = 'get';
 
 process.on('exit', function() {
   fs.unlinkSync(filepathOne);
   fs.unlinkSync(filepathTwoAbs);
   fs.unlinkSync(filenameThree);
+  fs.unlinkSync(filenameFour);
   assert.equal(1, watchSeenOne);
   assert.equal(2, watchSeenTwo);
   assert.equal(1, watchSeenThree);
+  assert.equal(1, watchSeenFour);
 });
 
 
@@ -126,3 +130,22 @@ assert.doesNotThrow(
 setTimeout(function() {
   fs.writeFileSync(filenameThree, 'pardner');
 }, 1000);
+
+setTimeout(function() {
+  fs.writeFileSync(filenameFour, 'hey');
+}, 200);
+
+setTimeout(function() {
+  fs.writeFileSync(filenameFour, 'hey');
+}, 500);
+
+assert.doesNotThrow(
+    function() {
+      function a(curr, prev) {
+        ++watchSeenFour;
+        assert.equal(1, watchSeenFour);
+        fs.unwatchFile("." + path.sep + filenameFour, a);
+      }
+      fs.watchFile(filenameFour, a);
+    }
+);