development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse source
This commit is contained in:
Benjamin Pasero 2021-12-10 17:24:48 +01:00
parent 4bc25f7394
commit 988b844f16
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/vs/platform/files/test/browser/fileService.test.ts
View file

@ -4,8 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { scheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
import { timeout } from 'vs/base/common/async';
import { DeferredPromise, timeout } from 'vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { consumeStream, newWriteableStream, ReadableStreamEvents } from 'vs/base/common/stream';
@ -304,6 +303,8 @@ suite('File Service', () => {
test('readFile/readFileStream supports cancellation (https://github.com/microsoft/vscode/issues/138805)', async () => {
const service = new FileService(new NullLogService());
let readFileStreamReady: DeferredPromise<void> | undefined = undefined;
const provider = new class extends NullFileSystemProvider {
override async stat(resource: URI): Promise<IStat> {
@ -317,7 +318,12 @@ suite('File Service', () => {
readFileStream(resource: URI, opts: FileReadStreamOptions, token: CancellationToken): ReadableStreamEvents<Uint8Array> {
const stream = newWriteableStream<Uint8Array>(chunk => chunk[0]);
token.onCancellationRequested(() => stream.error(new Error('Expected cancellation')));
token.onCancellationRequested(() => {
stream.error(new Error('Expected cancellation'));
stream.end();
});
readFileStreamReady!.complete();
return stream;
}
@ -327,13 +333,12 @@ suite('File Service', () => {
provider.setCapabilities(FileSystemProviderCapabilities.FileReadStream);
let e1;
try {
const cts = new CancellationTokenSource();
readFileStreamReady = new DeferredPromise();
const promise = service.readFile(URI.parse('test://foo/bar'), undefined, cts.token);
scheduleAtNextAnimationFrame(() => cts.cancel());
await promise;
await Promise.all([readFileStreamReady.p.then(() => cts.cancel()), promise]);
} catch (error) {
e1 = error;
}
@ -343,9 +348,9 @@ suite('File Service', () => {
let e2;
try {
const cts = new CancellationTokenSource();
readFileStreamReady = new DeferredPromise();
const stream = await service.readFileStream(URI.parse('test://foo/bar'), undefined, cts.token);
scheduleAtNextAnimationFrame(() => cts.cancel());
await consumeStream(stream.value, chunk => chunk[0]);
await Promise.all([readFileStreamReady.p.then(() => cts.cancel()), consumeStream(stream.value, chunk => chunk[0])]);
} catch (error) {
e2 = error;
}