Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ suite('Activation of Environments in Terminal', () => {
test('Should activate with virtualenv', async () => {
await testActivation(envPaths.virtualEnvPath);
});
test('Should activate with conda', async () => {
test('Should activate with conda', async function () {
this.skip();
// Powershell does not work with conda by default, hence use cmd.
await terminalSettings.update(
'integrated.defaultProfile.windows',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export function testLocatorWatcher(
locator.onChanged(onChanged);
await getEnvs(locator.iterEnvs()); // Force the FS watcher to start.
// Wait for watchers to get ready
await sleep(1000);
await sleep(2000);
}

teardown(async () => {
Expand Down Expand Up @@ -203,7 +203,7 @@ export function testLocatorWatcher(
externalDeps.arePathsSame(actualEvent!.searchLocation!.fsPath, path.dirname(envDir)),
'Wrong event emitted',
);
});
}).timeout(TEST_TIMEOUT * 2);

test('Detect when an environment has been deleted', async () => {
let actualEvent: PythonEnvsChangedEvent;
Expand Down Expand Up @@ -237,7 +237,7 @@ export function testLocatorWatcher(
externalDeps.arePathsSame(actualEvent!.searchLocation!.fsPath, path.dirname(envDir)),
'Wrong event emitted',
);
});
}).timeout(TEST_TIMEOUT * 2);

test('Detect when an environment has been updated', async () => {
let actualEvent: PythonEnvsChangedEvent;
Expand All @@ -264,5 +264,5 @@ export function testLocatorWatcher(
externalDeps.arePathsSame(actualEvent!.searchLocation!.fsPath, path.dirname(envDir)),
`Paths don't match ${actualEvent!.searchLocation!.fsPath} != ${path.dirname(envDir)}`,
);
});
}).timeout(TEST_TIMEOUT * 2);
}