Skip to content

Fix failing multiroot test #24049

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
rchiodo merged 3 commits into from
Sep 4, 2024
Merged

Fix failing multiroot test #24049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3dab78
Fix failing multiroot test
rchiodo Sep 3, 2024
7b8eb80
Put launch.json back
rchiodo Sep 3, 2024
fe5f0c5
Fix linting
rchiodo Sep 3, 2024
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
3 changes: 3 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test"
],
"env": {
"VSC_PYTHON_CI_TEST_GREP": "" // Modify this to run a subset of the single workspace tests
},
"sourceMaps": true,
"smartStep": true,
"outFiles": ["${workspaceFolder}/out/**/*", "!${workspaceFolder}/**/node_modules**/*"],
Expand Down
25 changes: 17 additions & 8 deletions src/test/common/variables/envVarsProvider.multiroot.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { expect, use } from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import * as path from 'path';
import { anything, instance, mock, when } from 'ts-mockito';
import { anything } from 'ts-mockito';
import { ConfigurationTarget, Disposable, Uri, workspace } from 'vscode';
import { WorkspaceService } from '../../../client/common/application/workspace';
import { PlatformService } from '../../../client/common/platform/platformService';
Expand All @@ -14,14 +14,14 @@ import { getSearchPathEnvVarNames } from '../../../client/common/utils/exec';
import { EnvironmentVariablesService } from '../../../client/common/variables/environment';
import { EnvironmentVariablesProvider } from '../../../client/common/variables/environmentVariablesProvider';
import { EnvironmentVariables } from '../../../client/common/variables/types';
import { EnvironmentActivationService } from '../../../client/interpreter/activation/service';
import { IEnvironmentActivationService } from '../../../client/interpreter/activation/types';
import { IInterpreterAutoSelectionService } from '../../../client/interpreter/autoSelection/types';
import { clearPythonPathInWorkspaceFolder, isOs, OSType, updateSetting } from '../../common';
import { closeActiveWindows, initialize, initializeTest, IS_MULTI_ROOT_TEST } from '../../initialize';
import { MockAutoSelectionService } from '../../mocks/autoSelector';
import { MockProcess } from '../../mocks/process';
import { UnitTestIocContainer } from '../../testing/serviceRegistry';
import { createTypeMoq } from '../../mocks/helper';

use(chaiAsPromised.default);

Expand All @@ -47,12 +47,21 @@ suite('Multiroot Environment Variables Provider', () => {
ioc.registerProcessTypes();
ioc.registerInterpreterStorageTypes();
await ioc.registerMockInterpreterTypes();
const mockEnvironmentActivationService = mock(EnvironmentActivationService);
when(mockEnvironmentActivationService.getActivatedEnvironmentVariables(anything())).thenResolve();
ioc.serviceManager.rebindInstance<IEnvironmentActivationService>(
IEnvironmentActivationService,
instance(mockEnvironmentActivationService),
);
const mockEnvironmentActivationService = createTypeMoq<IEnvironmentActivationService>();
mockEnvironmentActivationService
.setup((m) => m.getActivatedEnvironmentVariables(anything()))
.returns(() => Promise.resolve({}));
if (ioc.serviceManager.tryGet<IEnvironmentActivationService>(IEnvironmentActivationService)) {
Copy link
Copy Markdown
Author

@rchiodo rchiodo Sep 3, 2024

Choose a reason for hiding this comment

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

Root cause was inversify fails now if you rebind when something isn't already bound.

ioc.serviceManager.rebindInstance<IEnvironmentActivationService>(
IEnvironmentActivationService,
mockEnvironmentActivationService.object,
);
} else {
ioc.serviceManager.addSingletonInstance(
IEnvironmentActivationService,
mockEnvironmentActivationService.object,
);
}
return initializeTest();
});
suiteTeardown(closeActiveWindows);
Expand Down