rebased and fixed

Author: eleanorjboyd

src/extension/common/application/commands/reportIssueCommand.ts

@@ -6,11 +6,11 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import { executeCommand } from '../../vscodeapi';
-import { getActiveEnvironmentPath, resolveEnvironment } from '../../python';
 import { EXTENSION_ROOT_DIR } from '../../constants';
 import { sendTelemetryEvent } from '../../../telemetry';
 import { EventName } from '../../../telemetry/constants';
 import { PythonEnvironment } from '../../../envExtApi';
+import { getActiveEnvironmentPath, resolveEnvironment } from '../../python';
 
 /**
  * Allows the user to report an issue related to the Python Debugger extension using our template.

src/extension/common/python.ts

@@ -3,7 +3,7 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Environment, EnvironmentPath, ResolvedEnvironment, Resource } from '@vscode/python-extension';
-import { commands, EventEmitter, extensions, Uri, Event, Disposable } from 'vscode';
+import { commands, EventEmitter, extensions, Uri, Event, Disposable, Extension } from 'vscode';
 import { traceError, traceLog, traceWarn } from './log/logging';
 import { PythonEnvironment, PythonEnvironmentApi, PythonEnvsExtension } from '../envExtApi';
 import {

src/extension/debugger/adapter/factory.ts

@@ -19,12 +19,12 @@ import { executeCommand, showErrorMessage } from '../../common/vscodeapi';
 import { traceLog, traceVerbose } from '../../common/log/logging';
 import { EventName } from '../../telemetry/constants';
 import { sendTelemetryEvent } from '../../telemetry';
-import { getInterpreterDetails, resolveEnvironment, runPythonExtensionCommand } from '../../common/python';
 import { Commands, EXTENSION_ROOT_DIR } from '../../common/constants';
 import { Common, DebugConfigStrings, Interpreters } from '../../common/utils/localize';
 import { IPersistentStateFactory } from '../../common/types';
 import { fileToCommandArgumentForPythonExt } from '../../common/stringUtils';
 import { PythonEnvironment } from '../../envExtApi';
+import { resolveEnvironment, getInterpreterDetails, runPythonExtensionCommand } from '../../common/python';
 
 // persistent state names, exported to make use of in testing
 export enum debugStateKeys {

src/test/unittest/common/python.unit.test.ts

@@ -415,82 +415,6 @@ suite('Python API Tests', () => {
         });
     });
 
-    suite('hasInterpreters', () => {
-        test('Should return true when interpreters are available initially', async () => {
-            mockPythonEnvApi.environments.known = [{ id: 'env1', path: '/usr/bin/python3' } as Environment];
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.hasInterpreters();
-
-            expect(result).to.be.true;
-        });
-
-        test('Should return false when no interpreters are available', async () => {
-            mockPythonEnvApi.environments.known = [];
-            mockPythonEnvApi.environments.refreshEnvironments.resolves();
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.hasInterpreters();
-
-            expect(result).to.be.false;
-        });
-
-        test('Should wait for environments to be added after refresh', async () => {
-            mockPythonEnvApi.environments.known = [];
-            let onDidChangeCallback: any;
-            mockPythonEnvApi.environments.onDidChangeEnvironments = (callback: any) => {
-                onDidChangeCallback = callback;
-                return { dispose: sinon.stub() };
-            };
-            mockPythonEnvApi.environments.refreshEnvironments = async () => {
-                // Simulate environments being added
-                mockPythonEnvApi.environments.known = [{ id: 'env1', path: '/usr/bin/python3' } as Environment];
-                if (onDidChangeCallback) {
-                    onDidChangeCallback();
-                }
-            };
-
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.hasInterpreters();
-
-            expect(result).to.be.true;
-        });
-    });
-
-    suite('getInterpreters', () => {
-        test('Should return list of known interpreters', async () => {
-            const expectedEnvs: readonly Environment[] = [
-                { id: 'env1', path: '/usr/bin/python3' } as Environment,
-                { id: 'env2', path: '/usr/bin/python2' } as Environment,
-            ];
-            mockPythonEnvApi.environments.known = expectedEnvs;
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.getInterpreters();
-
-            expect(result).to.deep.equal(expectedEnvs);
-        });
-
-        test('Should return empty array when no interpreters are available', async () => {
-            mockPythonEnvApi.environments.known = [];
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.getInterpreters();
-
-            expect(result).to.deep.equal([]);
-        });
-
-        test('Should return empty array when known is null', async () => {
-            mockPythonEnvApi.environments.known = null;
-            sinon.stub(PythonExtension, 'api').resolves(mockPythonEnvApi);
-
-            const result = await pythonApi.getInterpreters();
-
-            expect(result).to.deep.equal([]);
-        });
-    });
-
     suite('onDidChangePythonInterpreter event', () => {
         test('Should fire event when active environment path changes', async () => {
             const disposables: Disposable[] = [];

src/test/unittest/common/pythonTrue.unit.test.ts

@@ -8,7 +8,7 @@ import * as sinon from 'sinon';
 import { Uri, Disposable, Extension, extensions } from 'vscode';
 import * as pythonApi from '../../../extension/common/python';
 import * as utilities from '../../../extension/common/utilities';
-import { Environment, EnvironmentPath } from '@vscode/python-extension';
+import { EnvironmentPath } from '@vscode/python-extension';
 import { buildPythonEnvironment } from './helpers';
 
 suite('Python API Tests- useEnvironmentsExtension:true', () => {
@@ -218,11 +218,6 @@ suite('Python API Tests- useEnvironmentsExtension:true', () => {
         });
 
         test('Should resolve environment from Environment object', async () => {
-            const env: Environment = {
-                id: 'test-env',
-                path: '/usr/bin/python3',
-                version: { major: 3, minor: 9, micro: 0 },
-            } as Environment;
             // Use buildPythonEnvironment for realistic mock
             const expectedEnv = buildPythonEnvironment('/usr/bin/python3', '3.9.0');