test: fix flaky test-fs-watch-recursive on OS X

The test was sometimes timing out due to a race condition. In OS X,
events for `fs.watch()` might only start showing up after a delay. This
is a limitation of the operating system. To work around that, there was
a timer in the test that delayed the writing of the file by 100ms.
However, sometimes that was not enough, and so the event never fired,
and the test timed out.

Change the timer to an interval so that it fires repeatedly until it is
picked up. This change only affects OS X.

Fixes: https://github.com/nodejs/node/issues/8511
PR-URL: https://github.com/nodejs/node/pull/9303
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
This commit is contained in:
Rich Trott 2016-10-26 15:44:10 -07:00
parent 2bd850b370
commit fd54df1e67

View File

@ -30,14 +30,17 @@ watcher.on('change', function(event, filename) {
if (filename !== relativePathOne)
return;
if (common.isOSX) {
clearInterval(interval);
}
watcher.close();
watcherClosed = true;
});
if (process.platform === 'darwin') {
setTimeout(function() {
if (common.isOSX) {
var interval = setInterval(function() {
fs.writeFileSync(filepathOne, 'world');
}, 100);
}, 10);
} else {
fs.writeFileSync(filepathOne, 'world');
}