try to fix test

Author: anthonykim1

src/client/common/terminal/service.ts

@@ -104,16 +104,7 @@ export class TerminalService implements ITerminalService, Disposable {
         }
         const config = getConfiguration('python');
         const pythonrcSetting = config.get<boolean>('terminal.shellIntegration.enabled');
-
-        const pythonPath = this.serviceContainer
-            .get<IConfigurationService>(IConfigurationService)
-            .getSettings(this.options?.resource).pythonPath;
-        const interpreterInfo =
-            this.options?.interpreter ||
-            (await this.serviceContainer
-                .get<IInterpreterService>(IInterpreterService)
-                .getInterpreterDetails(pythonPath));
-        const pythonVersion = interpreterInfo && interpreterInfo.version ? interpreterInfo.version.raw : undefined;
+        const pythonVersion = await this.getPythonVersion();
         const isPython313 = pythonVersion?.startsWith('3.13');
 
         if (isPythonShell && (!pythonrcSetting || isWindows() || isPython313)) {
@@ -191,4 +182,17 @@ export class TerminalService implements ITerminalService, Disposable {
             interpreterType,
         });
     }
+
+    private async getPythonVersion(): Promise<string | undefined> {
+        const pythonPath = this.serviceContainer
+            .get<IConfigurationService>(IConfigurationService)
+            .getSettings(this.options?.resource).pythonPath;
+        const interpreterInfo =
+            this.options?.interpreter ||
+            (await this.serviceContainer
+                .get<IInterpreterService>(IInterpreterService)
+                .getInterpreterDetails(pythonPath));
+        const pythonVersion = interpreterInfo && interpreterInfo.version ? interpreterInfo.version.raw : undefined;
+        return pythonVersion;
+    }
 }

src/test/common/terminals/service.unit.test.ts

@@ -19,15 +19,19 @@ import { EXTENSION_ROOT_DIR } from '../../../client/common/constants';
 import { IPlatformService } from '../../../client/common/platform/types';
 import { TerminalService } from '../../../client/common/terminal/service';
 import { ITerminalActivator, ITerminalHelper, TerminalShellType } from '../../../client/common/terminal/types';
-import { IDisposableRegistry } from '../../../client/common/types';
+import { IConfigurationService, IDisposableRegistry } from '../../../client/common/types';
 import { IServiceContainer } from '../../../client/ioc/types';
 import { ITerminalAutoActivation } from '../../../client/terminals/types';
 import { createPythonInterpreter } from '../../utils/interpreters';
 import * as workspaceApis from '../../../client/common/vscodeApis/workspaceApis';
 import * as platform from '../../../client/common/utils/platform';
+import { IInterpreterService } from '../../../client/interpreter/contracts';
+import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 
 suite('Terminal Service', () => {
     let service: TerminalService;
+    let configService: TypeMoq.IMock<IConfigurationService>;
+    let interpreterService: TypeMoq.IMock<IInterpreterService>;
     let terminal: TypeMoq.IMock<VSCodeTerminal>;
     let terminalManager: TypeMoq.IMock<ITerminalManager>;
     let terminalHelper: TypeMoq.IMock<ITerminalHelper>;
@@ -44,8 +48,23 @@ suite('Terminal Service', () => {
     let pythonConfig: TypeMoq.IMock<WorkspaceConfiguration>;
     let editorConfig: TypeMoq.IMock<WorkspaceConfiguration>;
     let isWindowsStub: sinon.SinonStub;
+    // let getPythonVersionStub: sinon.SinonStub;
 
     setup(() => {
+        configService = TypeMoq.Mock.ofType<IConfigurationService>();
+        configService.setup((c) => c.getSettings()).returns(() => ({ pythonPath: 'pythonPath' } as any));
+
+        // configService.setup((t) => t.getSettings);
+        interpreterService = TypeMoq.Mock.ofType<IInterpreterService>();
+        // when(interpreterService.getInterpreterDetails(anything())).thenResolve({
+        //     version: { major: 3 },
+        //     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        // } as any);
+
+        interpreterService
+            .setup((i) => i.getInterpreterDetails(TypeMoq.It.isAny()))
+            .returns(() => Promise.resolve(({ envName: 'base' } as unknown) as PythonEnvironment));
+
         terminal = TypeMoq.Mock.ofType<VSCodeTerminal>();
         terminalShellIntegration = TypeMoq.Mock.ofType<TerminalShellIntegration>();
         terminal.setup((t) => t.shellIntegration).returns(() => terminalShellIntegration.object);
@@ -95,8 +114,11 @@ suite('Terminal Service', () => {
         mockServiceContainer.setup((c) => c.get(IWorkspaceService)).returns(() => workspaceService.object);
         mockServiceContainer.setup((c) => c.get(ITerminalActivator)).returns(() => terminalActivator.object);
         mockServiceContainer.setup((c) => c.get(ITerminalAutoActivation)).returns(() => terminalAutoActivator.object);
+        mockServiceContainer.setup((c) => c.get(IConfigurationService)).returns(() => configService.object);
+        mockServiceContainer.setup((c) => c.get(IInterpreterService)).returns(() => interpreterService.object);
         getConfigurationStub = sinon.stub(workspaceApis, 'getConfiguration');
         isWindowsStub = sinon.stub(platform, 'isWindows');
+
         pythonConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
         editorConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
         getConfigurationStub.callsFake((section: string) => {
@@ -234,7 +256,7 @@ suite('Terminal Service', () => {
         terminal.verify((t) => t.sendText(TypeMoq.It.isValue(textToSend)), TypeMoq.Times.exactly(1));
     });
 
-    test('Ensure sendText is NOT called when Python shell integration and terminal shell integration are both enabled - Mac, Linux', async () => {
+    test('Ensure sendText is NOT called when Python shell integration and terminal shell integration are both enabled - Mac, Linux : !Python3.13', async () => {
         isWindowsStub.returns(false);
         pythonConfig
             .setup((p) => p.get('terminal.shellIntegration.enabled'))
@@ -256,6 +278,8 @@ suite('Terminal Service', () => {
         terminal.verify((t) => t.sendText(TypeMoq.It.isValue(textToSend)), TypeMoq.Times.never());
     });
 
+    // Ensure sendText is NOT called when Python shell integration and terminal shell integration are both enabled - Mac, Linux : Python3.13
+
     test('Ensure sendText IS called even when Python shell integration and terminal shell integration are both enabled - Window', async () => {
         isWindowsStub.returns(true);
         pythonConfig