mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-12 02:58:31 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -461,7 +461,7 @@ suite('ExtHostSearch', () => {
|
||||
]);
|
||||
});
|
||||
|
||||
test.skip('max results = 1', async () => {
|
||||
test('max results = 1', async () => {
|
||||
const reportedResults = [
|
||||
joinPath(rootFolderA, 'file1.ts'),
|
||||
joinPath(rootFolderA, 'file2.ts'),
|
||||
@@ -497,7 +497,7 @@ suite('ExtHostSearch', () => {
|
||||
assert(wasCanceled, 'Expected to be canceled when hitting limit');
|
||||
});
|
||||
|
||||
test.skip('max results = 2', async () => {
|
||||
test('max results = 2', async () => {
|
||||
const reportedResults = [
|
||||
joinPath(rootFolderA, 'file1.ts'),
|
||||
joinPath(rootFolderA, 'file2.ts'),
|
||||
@@ -533,7 +533,7 @@ suite('ExtHostSearch', () => {
|
||||
assert(wasCanceled, 'Expected to be canceled when hitting limit');
|
||||
});
|
||||
|
||||
test.skip('provider returns maxResults exactly', async () => {
|
||||
test('provider returns maxResults exactly', async () => {
|
||||
const reportedResults = [
|
||||
joinPath(rootFolderA, 'file1.ts'),
|
||||
joinPath(rootFolderA, 'file2.ts'),
|
||||
@@ -879,7 +879,7 @@ suite('ExtHostSearch', () => {
|
||||
});
|
||||
|
||||
test('basic sibling clause', async () => {
|
||||
mockPFS.readdir = (_path: string) => {
|
||||
mockPFS.readdir = (_path: string): any => {
|
||||
if (_path === rootFolderA.fsPath) {
|
||||
return Promise.resolve([
|
||||
'file1.js',
|
||||
@@ -922,7 +922,7 @@ suite('ExtHostSearch', () => {
|
||||
});
|
||||
|
||||
test('multiroot sibling clause', async () => {
|
||||
mockPFS.readdir = (_path: string) => {
|
||||
mockPFS.readdir = (_path: string): any => {
|
||||
if (_path === joinPath(rootFolderA, 'folder').fsPath) {
|
||||
return Promise.resolve([
|
||||
'fileA.scss',
|
||||
|
||||
Reference in New Issue
Block a user