Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -3,9 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TPromise } from 'vs/base/common/winjs.base';
import { generateUuid } from 'vs/base/common/uuid';
import { join } from 'path';
import { tmpdir } from 'os';
@@ -13,10 +10,10 @@ import { mkdirp, del } from 'vs/base/node/pfs';
export interface ITestFileResult {
testFile: string;
cleanUp: () => TPromise<void>;
cleanUp: () => Thenable<void>;
}
export function testFile(folder: string, file: string): TPromise<ITestFileResult> {
export function testFile(folder: string, file: string): Thenable<ITestFileResult> {
const id = generateUuid();
const parentDir = join(tmpdir(), 'vsctests', id);
const newDir = join(parentDir, 'config', id);
@@ -28,4 +25,4 @@ export function testFile(folder: string, file: string): TPromise<ITestFileResult
cleanUp: () => del(parentDir, tmpdir())
} as ITestFileResult;
});
}
}