Skip to content

Fix failing virtualenvwrapper Windows unit tests #14012

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
Kim-Adeline Miguel (kimadeline) merged 2 commits into from
Sep 22, 2020
Merged

Fix failing virtualenvwrapper Windows unit tests #14012

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
a787b5c
Fix tests
Sep 21, 2020
ead4b75
Typo
kimadeline Sep 22, 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
4 changes: 3 additions & 1 deletion src/client/pythonEnvironments/discovery/locators/services/virtualenvwrapperLocator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ export async function isVirtualenvwrapperEnvironment(interpreterPath:string): Pr
const environmentName = path.basename(path.dirname(path.dirname(interpreterPath)));

let environmentDir = path.join(workonHomeDir, environmentName);
let pathToCheck = interpreterPath;

if (getOSType() === OSType.Windows) {
environmentDir = environmentDir.toUpperCase();
pathToCheck = interpreterPath.toUpperCase();
}

return await pathExists(environmentDir) && interpreterPath.startsWith(`${environmentDir}${path.sep}`);
return await pathExists(environmentDir) && pathToCheck.startsWith(`${environmentDir}${path.sep}`);
}
6 changes: 2 additions & 4 deletions src/test/pythonEnvironments/discovery/locators/virtualenvwrapperLocator.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ suite('Virtualenvwrapper Locator Tests', () => {
pathExistsStub = sinon.stub(fileUtils, 'pathExists');
getDefaultDirStub = sinon.stub(virtualenvwrapperUtils, 'getDefaultVirtualenvwrapperDir');

pathExistsStub.withArgs(path.join(homeDir, envDirectory)).resolves(true);
pathExistsStub.resolves(false);
pathExistsStub.resolves(true);
});

teardown(() => {
Expand All @@ -32,7 +31,7 @@ suite('Virtualenvwrapper Locator Tests', () => {
getDefaultDirStub.restore();
});

test('WORKON_HOME is not set, and the interpreter is is in a subfolder', async () => {
test('WORKON_HOME is not set, and the interpreter is in a subfolder of virtualenvwrapper', async () => {
const interpreter = path.join(homeDir, envDirectory, 'bin', 'python');

getEnvVariableStub.withArgs('WORKON_HOME').returns(undefined);
Expand All @@ -56,7 +55,6 @@ suite('Virtualenvwrapper Locator Tests', () => {
const interpreter = path.join('some', 'path', envDirectory, 'bin', 'python');

getEnvVariableStub.withArgs('WORKON_HOME').returns(workonHomeDirectory);
pathExistsStub.withArgs(path.join(workonHomeDirectory, envDirectory)).resolves(false);

assert.deepStrictEqual(await isVirtualenvwrapperEnvironment(interpreter), false);
});
Expand Down