From 1ecb14aace2fe3473f8c13c9711063c110b734a8 Mon Sep 17 00:00:00 2001 From: Joyce Er Date: Wed, 27 Jan 2021 14:38:51 -0800 Subject: [PATCH] Always use test Python for test TensorBoard sessions (#15255) --- .../tensorBoard/tensorBoardSession.test.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/test/tensorBoard/tensorBoardSession.test.ts b/src/test/tensorBoard/tensorBoardSession.test.ts index 80f0c25c3e4c..b66549687c26 100644 --- a/src/test/tensorBoard/tensorBoardSession.test.ts +++ b/src/test/tensorBoard/tensorBoardSession.test.ts @@ -1,5 +1,6 @@ import { assert } from 'chai'; import Sinon, * as sinon from 'sinon'; +import { SemVer } from 'semver'; import { IApplicationShell, ICommandManager } from '../../client/common/application/types'; import { IExperimentService, IInstaller, InstallerResponse, ProductInstallStatus } from '../../client/common/types'; import { TensorBoard } from '../../client/common/utils/localize'; @@ -9,6 +10,22 @@ import { TensorBoardSession } from '../../client/tensorBoard/tensorBoardSession' import { TensorBoardSessionProvider } from '../../client/tensorBoard/tensorBoardSessionProvider'; import { closeActiveWindows, initialize } from '../initialize'; import * as ExperimentHelpers from '../../client/common/experiments/helpers'; +import { IInterpreterService } from '../../client/interpreter/contracts'; +import { Architecture } from '../../client/common/utils/platform'; +import { PythonEnvironment, EnvironmentType } from '../../client/pythonEnvironments/info'; +import { PYTHON_PATH } from '../common'; + +const info: PythonEnvironment = { + architecture: Architecture.Unknown, + companyDisplayName: '', + displayName: '', + envName: '', + path: '', + envType: EnvironmentType.Unknown, + version: new SemVer('0.0.0-alpha'), + sysPrefix: '', + sysVersion: '', +}; suite('TensorBoard session creation', async () => { let serviceManager: IServiceManager; @@ -33,6 +50,15 @@ suite('TensorBoard session creation', async () => { const experimentService = serviceManager.get(IExperimentService); sandbox.stub(experimentService, 'inExperiment').resolves(true); + // Ensure we use CI Python + const interpreter: PythonEnvironment = { + ...info, + envType: EnvironmentType.Unknown, + path: PYTHON_PATH, + }; + const interpreterService = serviceManager.get(IInterpreterService); + sandbox.stub(interpreterService, 'getActiveInterpreter').resolves(interpreter); + // Create tensorboard session provider provider = serviceManager.get(TensorBoardSessionProvider); await provider.activate();