1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: refactor test-fs-watch

Browse Source 
* Exchange 20 millisecond timers for setImmediate().

* Do not attempt to unlink path that will have been guaranteed to be
removed by `common.refreshTmpDir()`

* Do not swallow errors thrown by failed creation of needed test
subdirectory. If that happens, we want to know about it.

* Use `common.isSunOS` in one place where it is applicable

PR-URL: https://github.com/nodejs/node/pull/4776
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
This commit is contained in:
Rich Trott 2016-01-19 23:30:43 -08:00
parent 5ef9989bd6
commit d26b014391
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/sequential/test-fs-watch.js
View File

@ -51,9 +51,9 @@ assert.doesNotThrow(
}
);
setTimeout(function() {
setImmediate(function() {
fs.writeFileSync(filepathOne, 'world');
}, 20);
});
process.chdir(testDir);
@ -74,17 +74,16 @@ assert.doesNotThrow(
}
);
setTimeout(function() {
setImmediate(function() {
fs.writeFileSync(filepathTwoAbs, 'pardner');
}, 20);
});
try { fs.unlinkSync(filepathThree); } catch (e) {}
try { fs.mkdirSync(testsubdir, 0o700); } catch (e) {}
fs.mkdirSync(testsubdir, 0o700);
assert.doesNotThrow(
function() {
var watcher = fs.watch(testsubdir, function(event, filename) {
var renameEv = process.platform === 'sunos' ? 'change' : 'rename';
var renameEv = common.isSunOS ? 'change' : 'rename';
assert.equal(renameEv, event);
if (expectFilePath) {
assert.equal('newfile.txt', filename);
@ -97,10 +96,10 @@ assert.doesNotThrow(
}
);
setTimeout(function() {
setImmediate(function() {
var fd = fs.openSync(filepathThree, 'w');
fs.closeSync(fd);
}, 20);
});
// https://github.com/joyent/node/issues/2293 - non-persistent watcher should
// not block the event loop