Skip to content

Commit 1c366ef

Browse files
committed
skip integ tests on non-mac
1 parent 2c19cf4 commit 1c366ef

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

packages/core/src/shared/lsp/lspResolver.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { getApplicationSupportFolder } from '../vscode/env'
1414
import { createHash } from '../crypto'
1515
import request from '../request'
1616

17-
export const langugeServerDefaultDir = path.join(getApplicationSupportFolder(), `aws/toolkits/language-servers`)
1817
export class LanguageServerResolver {
1918
constructor(
2019
private readonly manifest: Manifest,
@@ -340,8 +339,13 @@ export class LanguageServerResolver {
340339
return version.targets.find((x) => x.arch === arch && x.platform === platform)
341340
}
342341

342+
// lazy calls to `getApplicationSupportFolder()` to avoid failure on windows.
343+
public static get defaultDir() {
344+
return path.join(getApplicationSupportFolder(), `aws/toolkits/language-servers`)
345+
}
346+
343347
defaultDownloadFolder() {
344-
return path.join(langugeServerDefaultDir, `${this.lsName}`)
348+
return path.join(LanguageServerResolver.defaultDir, `${this.lsName}`)
345349
}
346350

347351
private getDownloadDirectory(version: string) {

packages/core/src/testInteg/amazonq/lsp/workspaceInstaller.test.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { lspWorkspaceName, lspManifestUrl, WorkspaceLSPResolver } from '../../..
99
import { fs } from '../../../shared/fs/fs'
1010
import path from 'path'
1111
import * as sinon from 'sinon'
12-
import { langugeServerDefaultDir } from '../../../shared/lsp/lspResolver'
13-
import { ManifestResolver } from '../../../shared'
12+
import { LanguageServerResolver, ManifestResolver } from '../../../shared'
1413

1514
async function installVersion(version: string, cleanUp: boolean = false) {
1615
const resolver = new WorkspaceLSPResolver({ versionRange: new Range(version), cleanUp: cleanUp })
@@ -32,8 +31,11 @@ async function testInstallVersions(versions: string[]) {
3231

3332
describe('workspaceInstaller', function () {
3433
let testVersions: string[]
34+
let onMac: boolean
3535
before(async function () {
36-
await fs.delete(langugeServerDefaultDir, { force: true, recursive: true })
36+
// TODO: remove this when non-mac support is added.
37+
onMac = process.platform === 'darwin'
38+
await fs.delete(LanguageServerResolver.defaultDir, { force: true, recursive: true })
3739
const manifest = await new ManifestResolver(lspManifestUrl, lspWorkspaceName).resolve()
3840
testVersions = sort(
3941
manifest.versions
@@ -44,6 +46,9 @@ describe('workspaceInstaller', function () {
4446
})
4547

4648
it('removes all but the latest two versions', async function () {
49+
if (!onMac) {
50+
this.skip()
51+
}
4752
const versionsDownloaded = await testInstallVersions(testVersions)
4853

4954
assert.strictEqual(versionsDownloaded.length, 2)
@@ -52,6 +57,9 @@ describe('workspaceInstaller', function () {
5257
})
5358

5459
it('removes delisted versions then keeps 2 remaining most recent', async function () {
60+
if (!onMac) {
61+
this.skip()
62+
}
5563
const isDelisted = sinon.stub(WorkspaceLSPResolver.prototype, 'isDelisted' as any)
5664
isDelisted.callsFake((_manifestVersions, version) => {
5765
return version === testVersions[testVersions.length - 2]

0 commit comments

Comments
 (0)