Skip to content

Remove extension activation from unit tests #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2020
Merged

Remove extension activation from unit tests #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce8734
Remove extension activation from unit tests
awschristou May 19, 2020
7d940cc
Merge branch 'master' into awschristou/test-changes
awschristou May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/test/globalSetup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/**
* Before/After hooks for all "unit" tests
*/
import * as vscode from 'vscode'
import * as assert from 'assert'
import { appendFileSync, mkdirpSync } from 'fs-extra'
import { join } from 'path'
Expand All @@ -20,7 +19,6 @@ import { TelemetryPublisher } from '../shared/telemetry/telemetryPublisher'
import { FakeExtensionContext } from './fakeExtensionContext'
import { TestLogger } from './testLogger'
import { FakeAwsContext } from './utilities/fakeAwsContext'
import { VSCODE_EXTENSION_ID } from '../shared/extensions'

const testReportDir = join(__dirname, '../../../.test-reports')
const testLogOutput = join(testReportDir, 'testLog.log')
Expand All @@ -45,9 +43,6 @@ before(async () => {
}
const service = new DefaultTelemetryService(mockContext, mockAws, mockPublisher)
ext.telemetry = service

// Warm up vscode before tests run
await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)!.activate()
})

beforeEach(async function() {
Expand Down
6 changes: 6 additions & 0 deletions src/test/shared/codelens/localLambdaRunner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ import { DebugConfiguration } from '../../../lambda/local/debugConfiguration'
import * as localLambdaRunner from '../../../shared/codelens/localLambdaRunner'
import * as fsUtils from '../../../shared/filesystemUtilities'
import { ChildProcessResult } from '../../../shared/utilities/childProcess'
import { ExtensionDisposableFiles } from '../../../shared/utilities/disposableFiles'
import { FakeExtensionContext } from '../../fakeExtensionContext'
import { FakeChannelLogger } from '../fakeChannelLogger'
import { assertRejects } from '../utilities/assertUtils'

describe('localLambdaRunner', async () => {
let tempDir: string
before(async () => {
await ExtensionDisposableFiles.initialize(new FakeExtensionContext())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this conflict with the call in src/shared/utilities/disposableFiles.ts ? Since the tests are running in the same process and ExtensionDisposableFiles.initialize only allows one instance, it could cause an exception: #1132 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an oversight in how the test was initially set up.
The ExtensionDisposableFiles instance should be reset (to null) after this test suite. ExtensionDisposableFiles would need to have a method added to support this.

})

beforeEach(async () => {
tempDir = await fsUtils.makeTemporaryToolkitFolder()
})
Expand Down