Skip to content

Commit 3774ed5

Browse files
DonJayamanneDonJayamanne
authored
Fix Language server CI Tests
For #2700
1 parent 6ab381c commit 3774ed5

4 files changed

Lines changed: 12 additions & 7 deletions

File tree

‎src/client/activation/languageServerPackageRepository.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export enum LanguageServerDownloadChannel {
1515
daily = 'daily'
1616
}
1717

18-
enum LanguageServerPackageStorageContainers {
18+
export enum LanguageServerPackageStorageContainers {
1919
stable = 'vscode-python-ls-production',
2020
beta = 'vscode-python-ls-insiders',
2121
daily = 'vscode-python-ls-internal'

‎src/client/activation/languageServerPackageService.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ export const PackageNames = {
2222
[PlatformName.Mac64Bit]: `${downloadBaseFileName}-${PlatformName.Mac64Bit}`
2323
};
2424

25+
export const DefaultLanguageServerDownloadChannel = 'beta';
26+
2527
@injectable()
2628
export class LanguageServerPackageService implements ILanguageServerPackageService {
2729
public maxMajorVersion: number = maxMajorVersion;
@@ -61,6 +63,6 @@ export class LanguageServerPackageService implements ILanguageServerPackageServi
6163
public getLanguageServerDownloadChannel() {
6264
const configService = this.serviceContainer.get<IConfigurationService>(IConfigurationService);
6365
const settings = configService.getSettings();
64-
return settings.analysis.downloadChannel || 'beta';
66+
return settings.analysis.downloadChannel || DefaultLanguageServerDownloadChannel;
6567
}
6668
}

‎src/test/activation/languageServerPackageService.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import { expect } from 'chai';
99
import * as typeMoq from 'typemoq';
1010
import { WorkspaceConfiguration } from 'vscode';
11-
import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
11+
import { LanguageServerPackageStorageContainers } from '../../client/activation/languageServerPackageRepository';
12+
import { DefaultLanguageServerDownloadChannel, LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
1213
import { IHttpClient } from '../../client/activation/types';
1314
import { IWorkspaceService } from '../../client/common/application/types';
1415
import { HttpClient } from '../../client/common/net/httpClient';
@@ -68,10 +69,10 @@ suite('Language Server Package Service', () => {
6869
serviceContainer.setup(c => c.get(typeMoq.It.isValue(INugetService))).returns(() => nugetService);
6970
const platformService = new PlatformService();
7071
serviceContainer.setup(c => c.get(typeMoq.It.isValue(IPlatformService))).returns(() => platformService);
71-
const nugetRepo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.blob.core.windows.net', 'vscode-python-ls-production');
72+
const defaultStorageChannel = LanguageServerPackageStorageContainers[DefaultLanguageServerDownloadChannel];
73+
const nugetRepo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.blob.core.windows.net', defaultStorageChannel);
7274
serviceContainer.setup(c => c.get(typeMoq.It.isValue(INugetRepository))).returns(() => nugetRepo);
7375
const lsPackageService = new LanguageServerPackageService(serviceContainer.object);
74-
7576
const packageName = lsPackageService.getNugetPackageName();
7677
const packages = await nugetRepo.getPackages(packageName);
7778

‎src/test/common/nuget/azureBobStoreRepository.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import { expect } from 'chai';
77
import { SemVer } from 'semver';
88
import * as typeMoq from 'typemoq';
9-
import { LanguageServerPackageService } from '../../../client/activation/languageServerPackageService';
9+
import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServerPackageRepository';
10+
import { DefaultLanguageServerDownloadChannel, LanguageServerPackageService } from '../../../client/activation/languageServerPackageService';
1011
import { IHttpClient } from '../../../client/activation/types';
1112
import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
1213
import { INugetService } from '../../../client/common/nuget/types';
@@ -26,8 +27,9 @@ suite('Nuget Azure Storage Repository', () => {
2627
const nugetService = typeMoq.Mock.ofType<INugetService>();
2728
nugetService.setup(n => n.getVersionFromPackageFileName(typeMoq.It.isAny())).returns(() => new SemVer('1.1.1'));
2829
serviceContainer.setup(c => c.get(typeMoq.It.isValue(INugetService))).returns(() => nugetService.object);
30+
const defaultStorageChannel = LanguageServerPackageStorageContainers[DefaultLanguageServerDownloadChannel];
2931

30-
repo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.blob.core.windows.net', 'vscode-python-ls-production');
32+
repo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.blob.core.windows.net', defaultStorageChannel);
3133
});
3234

3335
test('Get all packages', async function () {

0 commit comments

Comments
 (0)