Skip to content

Commit df05eeb

Browse files
authored
Fix top level variables to resolve unknown issue in test explorer (#16917)
1 parent 3989f85 commit df05eeb

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/test/datascience/notebook/executionService.vscode.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ import { splitLines } from '../../../platform/common/helpers';
6767
import { isCI } from '../../../platform/vscode-path/platform';
6868
use(chaiAsPromised);
6969

70-
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
71-
const expectedPromptMessageSuffix = `requires ${ProductNames.get(Product.ipykernel)!} to be installed.`;
72-
7370
/* eslint-disable @typescript-eslint/no-explicit-any, no-invalid-this */
7471
suite('Kernel Execution @kernelCore', function () {
7572
let api: IExtensionTestApi;
@@ -92,6 +89,8 @@ suite('Kernel Execution @kernelCore', function () {
9289
this.timeout(120_000);
9390
try {
9491
api = await initialize();
92+
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
93+
const expectedPromptMessageSuffix = `requires ${ProductNames.get(Product.ipykernel)!} to be installed.`;
9594
await hijackPrompt(
9695
'showErrorMessage',
9796
{ endsWith: expectedPromptMessageSuffix },

src/test/datascience/notebook/exportFull.vscode.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ import { noop } from '../../../platform/common/utils/misc';
3535
import { PythonEnvironment } from '../../../platform/pythonEnvironments/info';
3636
import { format } from '../../../platform/common/helpers';
3737

38-
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
39-
const expectedPromptMessageSuffix = `requires ${ProductNames.get(Product.ipykernel)!} to be installed.`;
40-
4138
/* eslint-disable @typescript-eslint/no-explicit-any, no-invalid-this */
4239
suite('Export @export', function () {
4340
let api: IExtensionTestApi;
@@ -60,6 +57,9 @@ suite('Export @export', function () {
6057
INbConvertInterpreterDependencyChecker
6158
);
6259
interpreterService = api.serviceContainer.get<IInterpreterService>(IInterpreterService);
60+
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
61+
const expectedPromptMessageSuffix = `requires ${ProductNames.get(Product.ipykernel)!} to be installed.`;
62+
6363
await hijackPrompt(
6464
'showErrorMessage',
6565
{ endsWith: expectedPromptMessageSuffix },

src/test/datascience/widgets/standardWidgets.vscode.common.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ import { getTextOutputValue } from '../../../kernels/execution/helpers';
3939
import { isWeb } from '../../../platform/common/utils/misc';
4040
import { IS_REMOTE_NATIVE_TEST } from '../../constants';
4141

42-
const templateRootPath: Uri =
43-
workspace.workspaceFolders && workspace.workspaceFolders.length > 0
44-
? urlPath.joinPath(workspace.workspaceFolders[0].uri, 'widgets', 'notebooks')
45-
: Uri.file('');
4642
export async function initializeNotebookForWidgetTest(
4743
disposables: IDisposable[],
4844
options: { templateFile: string } | { notebookFile: Uri },
4945
editor: NotebookEditor = window.activeNotebookEditor!
5046
) {
47+
const templateRootPath: Uri =
48+
workspace.workspaceFolders && workspace.workspaceFolders.length > 0
49+
? urlPath.joinPath(workspace.workspaceFolders[0].uri, 'widgets', 'notebooks')
50+
: Uri.file('');
5151
const nbUri =
5252
'templateFile' in options
5353
? await createTemporaryNotebookFromFile(

0 commit comments

Comments
 (0)