development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix tests

Browse source
This commit is contained in:
Benjamin Pasero 2019-04-24 10:41:11 +02:00
parent 8f94e05f85
commit a671ca892c
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/vs/workbench/services/files/test/node/diskFileService.test.ts
View file

@ -15,13 +15,12 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
import { copy, rimraf, symlink, RimRafMode, rimrafSync } from 'vs/base/node/pfs';
import { URI } from 'vs/base/common/uri';
import { existsSync, statSync, readdirSync, readFileSync, writeFileSync, renameSync, unlinkSync, mkdirSync } from 'fs';
import { FileOperation, FileOperationEvent, IFileStat, FileOperationResult, FileSystemProviderCapabilities, FileChangeType, IFileChange, FileChangesEvent, FileOperationError } from 'vs/platform/files/common/files';
import { FileOperation, FileOperationEvent, IFileStat, FileOperationResult, FileSystemProviderCapabilities, FileChangeType, IFileChange, FileChangesEvent, FileOperationError, etag } from 'vs/platform/files/common/files';
import { NullLogService } from 'vs/platform/log/common/log';
import { isLinux, isWindows } from 'vs/base/common/platform';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { isEqual } from 'vs/base/common/resources';
import { VSBuffer, VSBufferReadable } from 'vs/base/common/buffer';
import { timeout } from 'vs/base/common/async';
function getByName(root: IFileStat, name: string): IFileStat | null {
if (root.children === undefined) {
@ -1340,24 +1339,22 @@ suite('Disk File Service', () => {
test('writeFile - error when writing to file that has been updated meanwhile', async () => {
const resource = URI.file(join(testDir, 'small.txt'));
const statBeforeWrite = await service.resolve(resource);
const stat = await service.resolve(resource);
const content = readFileSync(resource.fsPath).toString();
assert.equal(content, 'Small File');
await timeout(101); // account for mtime precision
const newContent = 'Updates to the small file';
const statAfterWrite = await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: statBeforeWrite.etag, mtime: statBeforeWrite.mtime });
assert.notEqual(statAfterWrite.etag, statBeforeWrite.etag);
assert.notEqual(statAfterWrite.mtime, statBeforeWrite.mtime);
await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: stat.etag, mtime: stat.mtime });
const newContentLeadingToError = newContent + newContent;
const fakeMtime = 1000;
const fakeSize = 1000;
let error: FileOperationError | undefined = undefined;
try {
await service.writeFile(resource, VSBuffer.fromString(newContentLeadingToError), { etag: statBeforeWrite.etag, mtime: statBeforeWrite.mtime });
await service.writeFile(resource, VSBuffer.fromString(newContentLeadingToError), { etag: etag(fakeMtime, fakeSize), mtime: fakeMtime });
} catch (err) {
error = err;
}
@ -1370,24 +1367,22 @@ suite('Disk File Service', () => {
test('writeFile - no error when writing to file where size is the same', async () => {
const resource = URI.file(join(testDir, 'small.txt'));
const statBeforeWrite = await service.resolve(resource);
const stat = await service.resolve(resource);
const content = readFileSync(resource.fsPath).toString();
assert.equal(content, 'Small File');
await timeout(101); // account for mtime precision
const newContent = content; // same content
const statAfterWrite = await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: statBeforeWrite.etag, mtime: statBeforeWrite.mtime });
assert.notEqual(statAfterWrite.etag, statBeforeWrite.etag);
assert.notEqual(statAfterWrite.mtime, statBeforeWrite.mtime);
await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: stat.etag, mtime: stat.mtime });
const newContentLeadingToNoError = newContent; // writing the same content should be OK
const fakeMtime = 1000;
const actualSize = newContent.length;
let error: FileOperationError | undefined = undefined;
try {
await service.writeFile(resource, VSBuffer.fromString(newContentLeadingToNoError), { etag: statBeforeWrite.etag, mtime: statBeforeWrite.mtime });
await service.writeFile(resource, VSBuffer.fromString(newContentLeadingToNoError), { etag: etag(fakeMtime, actualSize), mtime: fakeMtime });
} catch (err) {
error = err;
}