Fix failing virtualenvwrapper Windows unit tests (#14012)

kimadeline · karthiknadig · web-flow · commit a531cba7b786 · 2020-09-22T13:11:55.000-07:00
* Fix tests
* Typo
Co-authored-by: Karthik Nadig &lt;kanadig@microsoft.com&gt;
Co-authored-by: Karthik Nadig &lt;kanadig@microsoft.com&gt;
diff --git a/src/client/pythonEnvironments/discovery/locators/services/virtualenvwrapperLocator.ts b/src/client/pythonEnvironments/discovery/locators/services/virtualenvwrapperLocator.ts
@@ -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}`);
 }
diff --git a/src/test/pythonEnvironments/discovery/locators/virtualenvwrapperLocator.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/virtualenvwrapperLocator.unit.test.ts
@@ -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(() => {
@@ -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);
@@ -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);
     });

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,12 @@ export async function isVirtualenvwrapperEnvironment(interpreterPath:string): Pr`
`20`	`20`	`const environmentName = path.basename(path.dirname(path.dirname(interpreterPath)));`
`21`	`21`
`22`	`22`	`let environmentDir = path.join(workonHomeDir, environmentName);`
	`23`	`+ let pathToCheck = interpreterPath;`
`23`	`24`
`24`	`25`	`if (getOSType() === OSType.Windows) {`
`25`	`26`	`environmentDir = environmentDir.toUpperCase();`
	`27`	`+ pathToCheck = interpreterPath.toUpperCase();`
`26`	`28`	`}`
`27`	`29`
`28`		- return await pathExists(environmentDir) && interpreterPath.startsWith(`${environmentDir}${path.sep}`);
	`30`	+ return await pathExists(environmentDir) && pathToCheck.startsWith(`${environmentDir}${path.sep}`);
`29`	`31`	`}`