GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — test: ignore unrelated events in FW watch tests · nodejs/node@10b68ed

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

test/parallel

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-watch-recursive-add-file-to-existing-subfolder.js

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,8 @@ const relativePath = path.join(file, path.basename(subfolderPath), childrenFile)`
`40`	`40`	`const watcher = fs.watch(testDirectory, { recursive: true });`
`41`	`41`	`let watcherClosed = false;`
`42`	`42`	`watcher.on('change', function(event, filename) {`
`43`		`- assert.strictEqual(event, 'rename');`
`44`		`-`
`45`	`43`	`if (filename === relativePath) {`
	`44`	`+ assert.strictEqual(event, 'rename');`
`46`	`45`	`watcher.close();`
`47`	`46`	`watcherClosed = true;`
`48`	`47`	`}`

Collapse file

`‎test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-watch-recursive-add-file-to-new-folder.js

+12-24Lines changed: 12 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,32 +33,20 @@ const childrenAbsolutePath = path.join(filePath, childrenFile);`
`33`	`33`	`const childrenRelativePath = path.join(path.basename(filePath), childrenFile);`
`34`	`34`	`let watcherClosed = false;`
`35`	`35`
`36`		`-function doWatch() {`
`37`		`- const watcher = fs.watch(testDirectory, { recursive: true });`
`38`		`- watcher.on('change', function(event, filename) {`
	`36`	`+const watcher = fs.watch(testDirectory, { recursive: true });`
	`37`	`+watcher.on('change', function(event, filename) {`
	`38`	`+ if (filename === childrenRelativePath) {`
`39`	`39`	`assert.strictEqual(event, 'rename');`
`40`		`- assert.ok(filename === path.basename(filePath) \|\| filename === childrenRelativePath);`
`41`		`-`
`42`		`- if (filename === childrenRelativePath) {`
`43`		`- watcher.close();`
`44`		`- watcherClosed = true;`
`45`		`- }`
`46`		`- });`
`47`		`-`
`48`		`- // Do the write with a delay to ensure that the OS is ready to notify us.`
`49`		`- setTimeout(() => {`
`50`		`- fs.mkdirSync(filePath);`
`51`		`- fs.writeFileSync(childrenAbsolutePath, 'world');`
`52`		`- }, common.platformTimeout(200));`
`53`		`-}`
	`40`	`+ watcher.close();`
	`41`	`+ watcherClosed = true;`
	`42`	`+ }`
	`43`	`+});`
`54`	`44`
`55`		`-if (common.isMacOS) {`
`56`		`- // On macOS delay watcher start to avoid leaking previous events.`
`57`		`- // Refs: https://github.com/libuv/libuv/pull/4503`
`58`		`- setTimeout(doWatch, common.platformTimeout(100));`
`59`		`-} else {`
`60`		`- doWatch();`
`61`		`-}`
	`45`	`+// Do the write with a delay to ensure that the OS is ready to notify us.`
	`46`	`+setTimeout(() => {`
	`47`	`+ fs.mkdirSync(filePath);`
	`48`	`+ fs.writeFileSync(childrenAbsolutePath, 'world');`
	`49`	`+}, common.platformTimeout(200));`
`62`	`50`
`63`	`51`	`process.once('exit', function() {`
`64`	`52`	`assert(watcherClosed, 'watcher Object was not closed');`

Collapse file

`‎test/parallel/test-fs-watch-recursive-add-file-with-url.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-watch-recursive-add-file-with-url.js

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,8 @@ tmpdir.refresh();`
`35`	`35`	`const watcher = fs.watch(url, { recursive: true });`
`36`	`36`	`let watcherClosed = false;`
`37`	`37`	`watcher.on('change', function(event, filename) {`
`38`		`- assert.strictEqual(event, 'rename');`
`39`		`-`
`40`	`38`	`if (filename === path.basename(filePath)) {`
	`39`	`+ assert.strictEqual(event, 'rename');`
`41`	`40`	`watcher.close();`
`42`	`41`	`watcherClosed = true;`
`43`	`42`	`}`

Collapse file

`‎test/parallel/test-fs-watch-recursive-add-file.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-watch-recursive-add-file.js

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,8 @@ const testFile = path.join(testDirectory, 'file-1.txt');`
`31`	`31`	`const watcher = fs.watch(testDirectory, { recursive: true });`
`32`	`32`	`let watcherClosed = false;`
`33`	`33`	`watcher.on('change', function(event, filename) {`
`34`		`- assert.strictEqual(event, 'rename');`
`35`		`-`
`36`	`34`	`if (filename === path.basename(testFile)) {`
	`35`	`+ assert.strictEqual(event, 'rename');`
`37`	`36`	`watcher.close();`
`38`	`37`	`watcherClosed = true;`
`39`	`38`	`}`

Collapse file

`‎test/parallel/test-fs-watch-recursive-add-folder.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-watch-recursive-add-folder.js

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@ tmpdir.refresh();`
`33`	`33`	`const watcher = fs.watch(testDirectory, { recursive: true });`
`34`	`34`	`let watcherClosed = false;`
`35`	`35`	`watcher.on('change', function(event, filename) {`
`36`		`- assert.strictEqual(event, 'rename');`
`37`		`-`
`38`	`36`	`if (filename === path.basename(testFile)) {`
	`37`	`+ assert.strictEqual(event, 'rename');`
`39`	`38`	`watcher.close();`
`40`	`39`	`watcherClosed = true;`
`41`	`40`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.