maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

watcher - mitigate #137430

Browse source
This commit is contained in:
Benjamin Pasero 2021-11-19 10:37:52 +01:00
parent cd0e926097
commit 3a81c25c7a
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/platform/files/test/node/recursiveWatcher.integrationTest.ts
View file

@ -101,13 +101,13 @@ flakySuite('Recursive Watcher (parcel)', () => {
}
}
function awaitEvent(service: TestParcelWatcherService, path: string, type: FileChangeType, failOnEventReason?: string): Promise<void> {
async function awaitEvent(service: TestParcelWatcherService, path: string, type: FileChangeType, failOnEventReason?: string): Promise<void> {
if (loggingEnabled) {
console.log(`Awaiting change type '${toMsg(type)}' on file '${path}'`);
}
// Await the event
return new Promise<void>((resolve, reject) => {
await new Promise<void>((resolve, reject) => {
const disposable = service.onDidChangeFile(events => {
for (const event of events) {
if (event.path === path && event.type === type) {
@ -122,6 +122,12 @@ flakySuite('Recursive Watcher (parcel)', () => {
}
});
});
// Unwind from the event call stack: we have seen crashes in Parcel
// when e.g. calling `unsubscribe` directly from the stack of a file
// change event
// Refs: https://github.com/microsoft/vscode/issues/137430
await timeout(1);
}
function awaitMessage(service: TestParcelWatcherService, type: 'trace' | 'warn' | 'error' | 'info' | 'debug'): Promise<void> {
@ -395,8 +401,6 @@ flakySuite('Recursive Watcher (parcel)', () => {
changeFuture = awaitEvent(service, newTextFilePath, FileChangeType.ADDED);
await Promises.writeFile(newTextFilePath, 'Hello World');
await changeFuture;
return service.stop();
});
test('subsequent watch updates watchers (excludes)', async function () {
@ -408,8 +412,6 @@ flakySuite('Recursive Watcher (parcel)', () => {
let changeFuture: Promise<unknown> = awaitEvent(service, newTextFilePath, FileChangeType.ADDED);
await Promises.writeFile(newTextFilePath, 'Hello World');
await changeFuture;
return service.stop();
});
(isWindows /* windows: cannot create file symbolic link without elevated context */ ? test.skip : test)('symlink support (root)', async function () {