Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions

View File

@@ -12,7 +12,9 @@ import * as os from 'os';
import * as uuid from 'uuid';
import { BookTreeViewProvider } from '../../book/bookTreeView';
import { BookTreeItem } from '../../book/bookTreeItem';
import { promisify } from 'util';
import { MockExtensionContext } from '../common/stubs';
import { exists } from '../../common/utils';
export interface ExpectedBookItem {
title: string;
@@ -185,8 +187,8 @@ describe('BookTreeViewProviderTests', function() {
this.afterAll(async function () {
console.log('Removing temporary files...');
if (fs.existsSync(rootFolderPath)) {
rimraf.sync(rootFolderPath);
if (await exists(rootFolderPath)) {
await promisify(rimraf)(rootFolderPath);
}
console.log('Successfully removed temporary files.');
});
@@ -228,8 +230,8 @@ describe('BookTreeViewProviderTests', function() {
});
this.afterAll(async function () {
if (fs.existsSync(rootFolderPath)) {
rimraf.sync(rootFolderPath);
if (await exists(rootFolderPath)) {
await promisify(rimraf)(rootFolderPath);
}
});
});
@@ -273,8 +275,8 @@ describe('BookTreeViewProviderTests', function() {
});
this.afterAll(async function () {
if (fs.existsSync(rootFolderPath)) {
rimraf.sync(rootFolderPath);
if (await exists(rootFolderPath)) {
await promisify(rimraf)(rootFolderPath);
}
});
});
@@ -327,12 +329,9 @@ describe('BookTreeViewProviderTests', function() {
});
this.afterAll(async function () {
if (fs.existsSync(rootFolderPath)) {
rimraf.sync(rootFolderPath);
if (await exists(rootFolderPath)) {
await promisify(rimraf)(rootFolderPath);
}
});
});
});

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as vscode from 'vscode';
import { IServerInstance } from '../jupyter/common';

View File

@@ -4,8 +4,6 @@
*--------------------------------------------------------------------------------------------*/
// This code is originally from https://github.com/Microsoft/vscode/blob/master/src/vs/base/test/node/port.test.ts
'use strict';
import * as assert from 'assert';
import * as net from 'net';
import 'mocha';
@@ -61,4 +59,3 @@ describe('Ports', () => {
}, err => done(err));
});
});

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as should from 'should';
import 'mocha';

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as vscode from 'vscode';
export class MockExtensionContext implements vscode.ExtensionContext {

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as vscode from 'vscode';
import * as azdata from 'azdata';
import * as should from 'should';

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as should from 'should';
import 'mocha';
import * as TypeMoq from 'typemoq';

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as should from 'should';
import * as TypeMoq from 'typemoq';
import { nb } from 'azdata';
@@ -200,4 +198,3 @@ describe('Jupyter Future', function (): void {
}
});

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as should from 'should';
import * as TypeMoq from 'typemoq';
import { nb } from 'azdata';