ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/notebook/src/book/remoteBook.ts
View File

@@ -14,7 +14,7 @@ export abstract class RemoteBook {
this.remotePath = remotePath;
}
public async abstract createLocalCopy(): Promise<void>;
public abstract createLocalCopy(): Promise<void>;
public setLocalPath(): void {
// Save directory on User directory

6
extensions/notebook/src/dialog/configurePython/basePage.ts
View File

@@ -17,15 +17,15 @@ export abstract class BasePage {
/**
* This method constructs all the elements of the page.
*/
public async abstract initialize(): Promise<boolean>;
public abstract initialize(): Promise<boolean>;
/**
* This method is called when the user is entering the page.
*/
public async abstract onPageEnter(): Promise<void>;
public abstract onPageEnter(): Promise<void>;
/**
* This method is called when the user is leaving the page.
*/
public async abstract onPageLeave(): Promise<boolean>;
public abstract onPageLeave(): Promise<boolean>;
}

16
extensions/notebook/src/test/book/book.test.ts
View File

@@ -170,7 +170,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
bookTreeViewProvider = appContext.bookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
});
@@ -276,7 +276,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
providedbookTreeViewProvider = appContext.providedBookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([providedbookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('ProvidedBooksTreeViewProvider did not initialize in time'); })]);
await providedbookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
});
@@ -359,7 +359,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
pinnedTreeViewProvider = appContext.pinnedBookTreeViewProvider;
bookTreeViewProvider = appContext.bookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await Promise.race([pinnedTreeViewProvider.initialized, errorCase.then(() => { throw new Error('PinnedTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
@@ -478,7 +478,7 @@ describe('BooksTreeViewTests', function () {
index: 0
};
bookTreeViewProvider = new BookTreeViewProvider([folder], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(rootFolderPath, undefined, false, false);
});
@@ -556,7 +556,7 @@ describe('BooksTreeViewTests', function () {
index: 0
};
bookTreeViewProvider = new BookTreeViewProvider([folder], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -646,7 +646,7 @@ describe('BooksTreeViewTests', function () {
index: 0
}];
bookTreeViewProvider = new BookTreeViewProvider(folder, mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -716,7 +716,7 @@ describe('BooksTreeViewTests', function () {
const mockExtensionContext = new MockExtensionContext();
bookTreeViewProvider = new BookTreeViewProvider([], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -913,7 +913,7 @@ describe('BooksTreeViewTests', function () {
const mockExtensionContext = new MockExtensionContext();
bookTreeViewProvider = new BookTreeViewProvider([], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});

6
extensions/notebook/src/test/common/stubs.ts
View File

@@ -5,12 +5,16 @@
import * as vscode from 'vscode';
export interface ExtensionGlobalMemento extends vscode.Memento {
setKeysForSync(keys: string[]): void;
}
export class MockExtensionContext implements vscode.ExtensionContext {
logger: undefined;
logPath: './';
subscriptions: { dispose(): any; }[];
workspaceState: vscode.Memento;
globalState: vscode.Memento;
globalState: ExtensionGlobalMemento;
extensionPath: string;
extensionUri: vscode.Uri;
asAbsolutePath(relativePath: string): string {