Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions

View File

@@ -531,4 +531,30 @@ suite('Async', () => {
assert.notEqual(r1Queue, r1Queue2); // previous one got disposed after finishing
});
});
test('retry - success case', async () => {
let counter = 0;
const res = await async.retry(() => {
counter++;
if (counter < 2) {
return Promise.reject(new Error('fail'));
}
return Promise.resolve(true);
}, 10, 3);
assert.equal(res, true);
});
test('retry - error case', async () => {
let expectedError = new Error('fail');
try {
await async.retry(() => {
return Promise.reject(expectedError);
}, 10, 3);
} catch (error) {
assert.equal(error, error);
}
});
});

View File

@@ -7,7 +7,7 @@ import { IFilter, or, matchesPrefix, matchesStrictPrefix, matchesCamelCase, matc
function filterOk(filter: IFilter, word: string, wordToMatchAgainst: string, highlights?: { start: number; end: number; }[]) {
let r = filter(word, wordToMatchAgainst);
assert(r);
assert(r, `${word} didn't match ${wordToMatchAgainst}`);
if (highlights) {
assert.deepEqual(r, highlights);
}
@@ -202,6 +202,17 @@ suite('Filters', () => {
assert.ok(matchesWords('gipu', 'Category: Git: Pull', true) === null);
assert.deepEqual(matchesWords('pu', 'Category: Git: Pull', true), [{ start: 15, end: 17 }]);
filterOk(matchesWords, 'bar', 'foo-bar');
filterOk(matchesWords, 'bar test', 'foo-bar test');
filterOk(matchesWords, 'fbt', 'foo-bar test');
filterOk(matchesWords, 'bar test', 'foo-bar (test)');
filterOk(matchesWords, 'foo bar', 'foo (bar)');
filterNotOk(matchesWords, 'bar est', 'foo-bar test');
filterNotOk(matchesWords, 'fo ar', 'foo-bar test');
filterNotOk(matchesWords, 'for', 'foo-bar test');
filterNotOk(matchesWords, 'foo bar', 'foo-bar');
});
function assertMatches(pattern: string, word: string, decoratedWord: string | undefined, filter: FuzzyScorer, opts: { patternPos?: number, wordPos?: number, firstMatchCanBeWeak?: boolean } = {}) {

View File

@@ -246,41 +246,40 @@ suite('Extfs', () => {
});
test('writeFileAndFlush (string)', function (done) {
const id = uuid.generateUuid();
const parentDir = path.join(os.tmpdir(), 'vsctests', id);
const newDir = path.join(parentDir, 'extfs', id);
const testFile = path.join(newDir, 'flushed.txt');
const smallData = 'Hello World';
const bigData = (new Array(100 * 1024)).join('Large String\n');
mkdirp(newDir, 493, error => {
if (error) {
return done(error);
}
testWriteFileAndFlush(smallData, smallData, bigData, bigData, done);
});
assert.ok(fs.existsSync(newDir));
test('writeFileAndFlush (Buffer)', function (done) {
const smallData = 'Hello World';
const bigData = (new Array(100 * 1024)).join('Large String\n');
extfs.writeFileAndFlush(testFile, 'Hello World', null!, error => {
if (error) {
return done(error);
}
testWriteFileAndFlush(Buffer.from(smallData), smallData, Buffer.from(bigData), bigData, done);
});
assert.equal(fs.readFileSync(testFile), 'Hello World');
test('writeFileAndFlush (UInt8Array)', function (done) {
const smallData = 'Hello World';
const bigData = (new Array(100 * 1024)).join('Large String\n');
const largeString = (new Array(100 * 1024)).join('Large String\n');
extfs.writeFileAndFlush(testFile, largeString, null!, error => {
if (error) {
return done(error);
}
assert.equal(fs.readFileSync(testFile), largeString);
extfs.del(parentDir, os.tmpdir(), done, ignore);
});
});
});
testWriteFileAndFlush(new TextEncoder().encode(smallData), smallData, new TextEncoder().encode(bigData), bigData, done);
});
test('writeFileAndFlush (stream)', function (done) {
const smallData = 'Hello World';
const bigData = (new Array(100 * 1024)).join('Large String\n');
testWriteFileAndFlush(toReadable(smallData), smallData, toReadable(bigData), bigData, done);
});
function testWriteFileAndFlush(
smallData: string | Buffer | NodeJS.ReadableStream | Uint8Array,
smallDataValue: string,
bigData: string | Buffer | NodeJS.ReadableStream | Uint8Array,
bigDataValue: string,
done: (error: Error | null) => void
): void {
const id = uuid.generateUuid();
const parentDir = path.join(os.tmpdir(), 'vsctests', id);
const newDir = path.join(parentDir, 'extfs', id);
@@ -293,27 +292,25 @@ suite('Extfs', () => {
assert.ok(fs.existsSync(newDir));
extfs.writeFileAndFlush(testFile, toReadable('Hello World'), null!, error => {
extfs.writeFileAndFlush(testFile, smallData, null!, error => {
if (error) {
return done(error);
}
assert.equal(fs.readFileSync(testFile), 'Hello World');
assert.equal(fs.readFileSync(testFile), smallDataValue);
const largeString = (new Array(100 * 1024)).join('Large String\n');
extfs.writeFileAndFlush(testFile, toReadable(largeString), null!, error => {
extfs.writeFileAndFlush(testFile, bigData, null!, error => {
if (error) {
return done(error);
}
assert.equal(fs.readFileSync(testFile), largeString);
assert.equal(fs.readFileSync(testFile), bigDataValue);
extfs.del(parentDir, os.tmpdir(), done, ignore);
});
});
});
});
}
test('writeFileAndFlush (file stream)', function (done) {
const id = uuid.generateUuid();