Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: refactor the code in test-fs-watch.js #10357

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions test/sequential/test-fs-watch.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
'use strict';
var common = require('../common');
var assert = require('assert');
var path = require('path');
var fs = require('fs');
const common = require('../common');
const assert = require('assert');
const path = require('path');
const fs = require('fs');

var expectFilePath = common.isWindows ||
common.isLinux ||
common.isOSX;
const expectFilePath = common.isWindows ||
common.isLinux ||
common.isOSX;

var watchSeenOne = 0;
var watchSeenTwo = 0;
var watchSeenThree = 0;
let watchSeenOne = 0;
let watchSeenTwo = 0;
let watchSeenThree = 0;

var testDir = common.tmpDir;
const testDir = common.tmpDir;

var filenameOne = 'watch.txt';
var filepathOne = path.join(testDir, filenameOne);
const filenameOne = 'watch.txt';
const filepathOne = path.join(testDir, filenameOne);

var filenameTwo = 'hasOwnProperty';
var filepathTwo = filenameTwo;
var filepathTwoAbs = path.join(testDir, filenameTwo);
const filenameTwo = 'hasOwnProperty';
const filepathTwo = filenameTwo;
const filepathTwoAbs = path.join(testDir, filenameTwo);

process.on('exit', function() {
assert.ok(watchSeenOne > 0);
Expand All @@ -33,12 +33,12 @@ fs.writeFileSync(filepathOne, 'hello');

assert.doesNotThrow(
function() {
var watcher = fs.watch(filepathOne);
const watcher = fs.watch(filepathOne);
watcher.on('change', function(event, filename) {
assert.equal('change', event);
assert.strictEqual('change', event);

if (expectFilePath) {
assert.equal('watch.txt', filename);
assert.strictEqual('watch.txt', filename);
}
watcher.close();
++watchSeenOne;
Expand All @@ -57,11 +57,11 @@ fs.writeFileSync(filepathTwoAbs, 'howdy');

assert.doesNotThrow(
function() {
var watcher = fs.watch(filepathTwo, function(event, filename) {
assert.equal('change', event);
const watcher = fs.watch(filepathTwo, function(event, filename) {
assert.strictEqual('change', event);

if (expectFilePath) {
assert.equal('hasOwnProperty', filename);
assert.strictEqual('hasOwnProperty', filename);
}
watcher.close();
++watchSeenTwo;
Expand All @@ -79,13 +79,13 @@ const filepathThree = path.join(testsubdir, filenameThree);

assert.doesNotThrow(
function() {
var watcher = fs.watch(testsubdir, function(event, filename) {
var renameEv = common.isSunOS ? 'change' : 'rename';
assert.equal(renameEv, event);
const watcher = fs.watch(testsubdir, function(event, filename) {
const renameEv = common.isSunOS ? 'change' : 'rename';
assert.strictEqual(renameEv, event);
if (expectFilePath) {
assert.equal('newfile.txt', filename);
assert.strictEqual('newfile.txt', filename);
} else {
assert.equal(null, filename);
assert.strictEqual(null, filename);
}
watcher.close();
++watchSeenThree;
Expand All @@ -94,7 +94,7 @@ assert.doesNotThrow(
);

setImmediate(function() {
var fd = fs.openSync(filepathThree, 'w');
const fd = fs.openSync(filepathThree, 'w');
fs.closeSync(fd);
});

Expand All @@ -106,17 +106,17 @@ fs.watch(__filename, {persistent: false}, function() {

// whitebox test to ensure that wrapped FSEvent is safe
// https://github.com/joyent/node/issues/6690
var oldhandle;
let oldhandle;
assert.throws(function() {
var w = fs.watch(__filename, function(event, filename) { });
const w = fs.watch(__filename, function(event, filename) { });
oldhandle = w._handle;
w._handle = { close: w._handle.close };
w.close();
}, TypeError);
oldhandle.close(); // clean up

assert.throws(function() {
var w = fs.watchFile(__filename, {persistent: false}, function() {});
const w = fs.watchFile(__filename, {persistent: false}, function() {});
oldhandle = w._handle;
w._handle = { stop: w._handle.stop };
w.stop();
Expand Down