(IConfigurationService)).thenReturn(
instance(configurationService),
diff --git a/extensions/positron-python/src/test/common.ts b/extensions/positron-python/src/test/common.ts
index 2ef366a3a47..bbf48f0e14c 100644
--- a/extensions/positron-python/src/test/common.ts
+++ b/extensions/positron-python/src/test/common.ts
@@ -22,7 +22,7 @@ const StreamZip = require('node-stream-zip');
export { sleep } from './core';
-const fileInNonRootWorkspace = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'pythonFiles', 'dummy.py');
+const fileInNonRootWorkspace = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'python_files', 'dummy.py');
export const rootWorkspaceUri = getWorkspaceRoot();
export const PYTHON_PATH = getPythonPath();
diff --git a/extensions/positron-python/src/test/common/application/commands/issueTemplateVenv2.md b/extensions/positron-python/src/test/common/application/commands/issueTemplate.md
similarity index 51%
rename from extensions/positron-python/src/test/common/application/commands/issueTemplateVenv2.md
rename to extensions/positron-python/src/test/common/application/commands/issueTemplate.md
index fa9142e5ca4..a95af90ff7f 100644
--- a/extensions/positron-python/src/test/common/application/commands/issueTemplateVenv2.md
+++ b/extensions/positron-python/src/test/common/application/commands/issueTemplate.md
@@ -1,6 +1,5 @@
# Behaviour
-## Expected vs. Actual
XXX
@@ -12,13 +11,9 @@ XXX
**After** creating the issue on GitHub, you can add screenshots and GIFs of what is happening. Consider tools like https://www.cockos.com/licecap/, https://github.com/phw/peek or https://www.screentogif.com/ for GIF creation.
-->
-
+
# Diagnostic data
-- Python version (& distribution if applicable, e.g. Anaconda): 3.9.0
-- Type of virtual environment used (e.g. conda, venv, virtualenv, etc.): Venv
-- Value of the `python.languageServer` setting: Pylance
-
Output for Python in the Output panel (View→Output, change the drop-down the upper-right of the Output panel to Python)
@@ -32,22 +27,3 @@ XXX
-
-
-
-User Settings
-
-
-
-```
-Multiroot scenario, following user settings may not apply:
-
-experiments
-• enabled: false
-
-venvPath: ""
-
-```
-
-
-
diff --git a/extensions/positron-python/src/test/common/application/commands/issueTemplateVenv1.md b/extensions/positron-python/src/test/common/application/commands/issueTemplateVenv1.md
deleted file mode 100644
index 09cdd2c32eb..00000000000
--- a/extensions/positron-python/src/test/common/application/commands/issueTemplateVenv1.md
+++ /dev/null
@@ -1,56 +0,0 @@
-
-# Behaviour
-## Expected vs. Actual
-
-XXX
-
-## Steps to reproduce:
-
-1. XXX
-
-
-
-
-# Diagnostic data
-
-- Python version (& distribution if applicable, e.g. Anaconda): 3.9.0
-- Type of virtual environment used (e.g. conda, venv, virtualenv, etc.): Venv
-- Value of the `python.languageServer` setting: Pylance
-
-
-
-Output for Python in the Output panel (View→Output, change the drop-down the upper-right of the Output panel to Python)
-
-
-
-
-```
-XXX
-```
-
-
-
-
-
-
-User Settings
-
-
-
-```
-
-experiments
-• enabled: false
-• optInto: []
-• optOutFrom: []
-
-venvPath: ""
-
-pipenvPath: ""
-
-```
-
-
-
diff --git a/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv1.md b/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv1.md
new file mode 100644
index 00000000000..9c1aac03cf5
--- /dev/null
+++ b/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv1.md
@@ -0,0 +1,30 @@
+- Python version (& distribution if applicable, e.g. Anaconda): 3.9.0
+- Type of virtual environment used (e.g. conda, venv, virtualenv, etc.): Venv
+- Value of the `python.languageServer` setting: Pylance
+
+
+User Settings
+
+
+```
+
+experiments
+• enabled: false
+• optInto: []
+• optOutFrom: []
+
+venvPath: ""
+
+pipenvPath: ""
+
+```
+
+
+
+
+Installed Extensions
+
+|Extension Name|Extension Id|Version|
+|---|---|---|
+|Python|ms-python.python|2020.2|
+
diff --git a/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv2.md b/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv2.md
new file mode 100644
index 00000000000..fa218fc35b0
--- /dev/null
+++ b/extensions/positron-python/src/test/common/application/commands/issueUserDataTemplateVenv2.md
@@ -0,0 +1,27 @@
+- Python version (& distribution if applicable, e.g. Anaconda): 3.9.0
+- Type of virtual environment used (e.g. conda, venv, virtualenv, etc.): Venv
+- Value of the `python.languageServer` setting: Pylance
+
+
+User Settings
+
+
+```
+Multiroot scenario, following user settings may not apply:
+
+experiments
+• enabled: false
+
+venvPath: ""
+
+```
+
+
+
+
+Installed Extensions
+
+|Extension Name|Extension Id|Version|
+|---|---|---|
+|Python|ms-python.python|2020.2|
+
diff --git a/extensions/positron-python/src/test/common/application/commands/reportIssueCommand.unit.test.ts b/extensions/positron-python/src/test/common/application/commands/reportIssueCommand.unit.test.ts
index 92b4c0725f3..2a35a6306cd 100644
--- a/extensions/positron-python/src/test/common/application/commands/reportIssueCommand.unit.test.ts
+++ b/extensions/positron-python/src/test/common/application/commands/reportIssueCommand.unit.test.ts
@@ -30,6 +30,7 @@ import { IConfigurationService } from '../../../../client/common/types';
import { EventName } from '../../../../client/telemetry/constants';
import { EnvironmentType, PythonEnvironment } from '../../../../client/pythonEnvironments/info';
import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../../constants';
+import * as extensionsApi from '../../../../client/common/vscodeApis/extensionsApi';
suite('Report Issue Command', () => {
let reportIssueCommandHandler: ReportIssueCommandHandler;
@@ -38,6 +39,8 @@ suite('Report Issue Command', () => {
let interpreterService: IInterpreterService;
let configurationService: IConfigurationService;
let appEnvironment: IApplicationEnvironment;
+ let expectedIssueBody: string;
+ let getExtensionsStub: sinon.SinonStub;
setup(async () => {
workspaceService = mock(WorkspaceService);
@@ -45,6 +48,7 @@ suite('Report Issue Command', () => {
interpreterService = mock(InterpreterService);
configurationService = mock(ConfigurationService);
appEnvironment = mock();
+ getExtensionsStub = sinon.stub(extensionsApi, 'getExtensions');
when(cmdManager.executeCommand('workbench.action.openIssueReporter', anything())).thenResolve();
when(workspaceService.getConfiguration('python')).thenReturn(
@@ -79,6 +83,27 @@ suite('Report Issue Command', () => {
instance(appEnvironment),
);
await reportIssueCommandHandler.activate();
+
+ const issueTemplatePath = path.join(
+ EXTENSION_ROOT_DIR_FOR_TESTS,
+ 'src',
+ 'test',
+ 'common',
+ 'application',
+ 'commands',
+ 'issueTemplate.md',
+ );
+ expectedIssueBody = fs.readFileSync(issueTemplatePath, 'utf8');
+
+ getExtensionsStub.returns([
+ {
+ id: 'ms-python.python',
+ packageJSON: {
+ displayName: 'Python',
+ version: '2020.2',
+ },
+ },
+ ]);
});
teardown(() => {
@@ -88,27 +113,28 @@ suite('Report Issue Command', () => {
test('Test if issue body is filled correctly when including all the settings', async () => {
await reportIssueCommandHandler.openReportIssue();
- const templatePath = path.join(
+ const userDataTemplatePath = path.join(
EXTENSION_ROOT_DIR_FOR_TESTS,
'src',
'test',
'common',
'application',
'commands',
- 'issueTemplateVenv1.md',
+ 'issueUserDataTemplateVenv1.md',
);
- const expectedIssueBody = fs.readFileSync(templatePath, 'utf8');
+ const expectedData = fs.readFileSync(userDataTemplatePath, 'utf8');
- const args: [string, { extensionId: string; issueBody: string }] = capture<
+ const args: [string, { extensionId: string; issueBody: string; data: string }] = capture<
AllCommands,
- { extensionId: string; issueBody: string }
+ { extensionId: string; issueBody: string; data: string }
>(cmdManager.executeCommand).last();
verify(cmdManager.registerCommand(Commands.ReportIssue, anything(), anything())).once();
verify(cmdManager.executeCommand('workbench.action.openIssueReporter', anything())).once();
expect(args[0]).to.be.equal('workbench.action.openIssueReporter');
- const actual = args[1].issueBody;
- expect(actual).to.be.equal(expectedIssueBody);
+ const { issueBody, data } = args[1];
+ expect(issueBody).to.be.equal(expectedIssueBody);
+ expect(data).to.be.equal(expectedData);
});
test('Test if issue body is filled when only including settings which are explicitly set', async () => {
@@ -128,26 +154,27 @@ suite('Report Issue Command', () => {
await reportIssueCommandHandler.activate();
await reportIssueCommandHandler.openReportIssue();
- const templatePath = path.join(
+ const userDataTemplatePath = path.join(
EXTENSION_ROOT_DIR_FOR_TESTS,
'src',
'test',
'common',
'application',
'commands',
- 'issueTemplateVenv2.md',
+ 'issueUserDataTemplateVenv2.md',
);
- const expectedIssueBody = fs.readFileSync(templatePath, 'utf8');
+ const expectedData = fs.readFileSync(userDataTemplatePath, 'utf8');
- const args: [string, { extensionId: string; issueBody: string }] = capture<
+ const args: [string, { extensionId: string; issueBody: string; data: string }] = capture<
AllCommands,
- { extensionId: string; issueBody: string }
+ { extensionId: string; issueBody: string; data: string }
>(cmdManager.executeCommand).last();
verify(cmdManager.executeCommand('workbench.action.openIssueReporter', anything())).once();
expect(args[0]).to.be.equal('workbench.action.openIssueReporter');
- const actual = args[1].issueBody;
- expect(actual).to.be.equal(expectedIssueBody);
+ const { issueBody, data } = args[1];
+ expect(issueBody).to.be.equal(expectedIssueBody);
+ expect(data).to.be.equal(expectedData);
});
test('Should send telemetry event when run Report Issue Command', async () => {
const sendTelemetryStub = sinon.stub(Telemetry, 'sendTelemetryEvent');
diff --git a/extensions/positron-python/src/test/common/terminals/service.unit.test.ts b/extensions/positron-python/src/test/common/terminals/service.unit.test.ts
index 7336f7094e6..61556e3df2d 100644
--- a/extensions/positron-python/src/test/common/terminals/service.unit.test.ts
+++ b/extensions/positron-python/src/test/common/terminals/service.unit.test.ts
@@ -170,7 +170,7 @@ suite('Terminal Service', () => {
.setup((t) => t.createTerminal(TypeMoq.It.isAny()))
.returns(() => terminal.object)
.verifiable(TypeMoq.Times.atLeastOnce());
- const envVarScript = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'pythonrc.py');
+ const envVarScript = path.join(EXTENSION_ROOT_DIR, 'python_files', 'pythonrc.py');
terminalManager
.setup((t) =>
t.createTerminal({
diff --git a/extensions/positron-python/src/test/common/terminals/synchronousTerminalService.unit.test.ts b/extensions/positron-python/src/test/common/terminals/synchronousTerminalService.unit.test.ts
index f74c529ef47..4b6e77ec809 100644
--- a/extensions/positron-python/src/test/common/terminals/synchronousTerminalService.unit.test.ts
+++ b/extensions/positron-python/src/test/common/terminals/synchronousTerminalService.unit.test.ts
@@ -66,7 +66,7 @@ suite('Terminal Service (synchronous)', () => {
});
});
suite('sendCommand', () => {
- const shellExecFile = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'shell_exec.py');
+ const shellExecFile = path.join(EXTENSION_ROOT_DIR, 'python_files', 'shell_exec.py');
test('run sendCommand in terminalService if there is no cancellation token', async () => {
when(terminalService.sendCommand('cmd', deepEqual(['1', '2']))).thenResolve();
diff --git a/extensions/positron-python/src/test/configuration/environmentTypeComparer.unit.test.ts b/extensions/positron-python/src/test/configuration/environmentTypeComparer.unit.test.ts
index ccd0aa6add2..53f6bccad3c 100644
--- a/extensions/positron-python/src/test/configuration/environmentTypeComparer.unit.test.ts
+++ b/extensions/positron-python/src/test/configuration/environmentTypeComparer.unit.test.ts
@@ -16,6 +16,7 @@ import {
} from '../../client/interpreter/configuration/environmentTypeComparer';
import { IInterpreterHelper } from '../../client/interpreter/contracts';
import { PythonEnvType } from '../../client/pythonEnvironments/base/info';
+import * as pyenv from '../../client/pythonEnvironments/common/environmentManagers/pyenv';
import { EnvironmentType, PythonEnvironment } from '../../client/pythonEnvironments/info';
// --- Start Positron ---
import * as externalDependencies from '../../client/pythonEnvironments/common/externalDependencies';
@@ -28,6 +29,7 @@ suite('Environment sorting', () => {
let interpreterHelper: IInterpreterHelper;
let getActiveWorkspaceUriStub: sinon.SinonStub;
let getInterpreterTypeDisplayNameStub: sinon.SinonStub;
+ const preferredPyenv = path.join('path', 'to', 'preferred', 'pyenv');
setup(() => {
getActiveWorkspaceUriStub = sinon.stub().returns({ folderUri: { fsPath: workspacePath } });
@@ -37,6 +39,8 @@ suite('Environment sorting', () => {
getActiveWorkspaceUri: getActiveWorkspaceUriStub,
getInterpreterTypeDisplayName: getInterpreterTypeDisplayNameStub,
} as unknown) as IInterpreterHelper;
+ const getActivePyenvForDirectory = sinon.stub(pyenv, 'getActivePyenvForDirectory');
+ getActivePyenvForDirectory.resolves(preferredPyenv);
});
teardown(() => {
@@ -171,6 +175,33 @@ suite('Environment sorting', () => {
expected: -1,
},
// --- End Positron ---
+ {
+ title: 'Preferred Pyenv interpreter should come before any global interpreter',
+ envA: {
+ envType: EnvironmentType.Pyenv,
+ version: { major: 3, minor: 12, patch: 2 },
+ path: preferredPyenv,
+ } as PythonEnvironment,
+ envB: {
+ envType: EnvironmentType.Pyenv,
+ version: { major: 3, minor: 10, patch: 2 },
+ path: path.join('path', 'to', 'normal', 'pyenv'),
+ } as PythonEnvironment,
+ expected: -1,
+ },
+ {
+ title: 'Pyenv interpreters should come first when there are global interpreters',
+ envA: {
+ envType: EnvironmentType.Global,
+ version: { major: 3, minor: 10, patch: 2 },
+ } as PythonEnvironment,
+ envB: {
+ envType: EnvironmentType.Pyenv,
+ version: { major: 3, minor: 7, patch: 2 },
+ path: path.join('path', 'to', 'normal', 'pyenv'),
+ } as PythonEnvironment,
+ expected: 1,
+ },
{
title: 'Global environment should not come first when there are global envs',
envA: {
@@ -307,8 +338,9 @@ suite('Environment sorting', () => {
];
testcases.forEach(({ title, envA, envB, expected }) => {
- test(title, () => {
+ test(title, async () => {
const envTypeComparer = new EnvironmentTypeComparer(interpreterHelper);
+ await envTypeComparer.initialize(undefined);
const result = envTypeComparer.compare(envA, envB);
assert.strictEqual(result, expected);
diff --git a/extensions/positron-python/src/test/debugger/extension/adapter/adapter.test.ts b/extensions/positron-python/src/test/debugger/extension/adapter/adapter.test.ts
index 7e20d5b930b..2f60290897a 100644
--- a/extensions/positron-python/src/test/debugger/extension/adapter/adapter.test.ts
+++ b/extensions/positron-python/src/test/debugger/extension/adapter/adapter.test.ts
@@ -19,7 +19,7 @@ function resolveWSFile(wsRoot: string, ...filePath: string[]): string {
}
suite('Debugger Integration', () => {
- const file = resolveWSFile(WS_ROOT, 'pythonFiles', 'debugging', 'wait_for_file.py');
+ const file = resolveWSFile(WS_ROOT, 'python_files', 'debugging', 'wait_for_file.py');
const doneFile = resolveWSFile(WS_ROOT, 'should-not-exist');
const outFile = resolveWSFile(WS_ROOT, 'output.txt');
const resource = vscode.Uri.file(file);
diff --git a/extensions/positron-python/src/test/debugger/extension/adapter/factory.unit.test.ts b/extensions/positron-python/src/test/debugger/extension/adapter/factory.unit.test.ts
index 5728bf0c34c..172c2715b08 100644
--- a/extensions/positron-python/src/test/debugger/extension/adapter/factory.unit.test.ts
+++ b/extensions/positron-python/src/test/debugger/extension/adapter/factory.unit.test.ts
@@ -41,7 +41,7 @@ suite('Debugging - Adapter Factory', () => {
let commandManager: ICommandManager;
const nodeExecutable = undefined;
- const debugAdapterPath = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'lib', 'python', 'debugpy', 'adapter');
+ const debugAdapterPath = path.join(EXTENSION_ROOT_DIR, 'python_files', 'lib', 'python', 'debugpy', 'adapter');
const pythonPath = path.join('path', 'to', 'python', 'interpreter');
const interpreter = {
architecture: Architecture.Unknown,
diff --git a/extensions/positron-python/src/test/debugger/extension/adapter/remoteLaunchers.unit.test.ts b/extensions/positron-python/src/test/debugger/extension/adapter/remoteLaunchers.unit.test.ts
index aa520f66faa..2a75f6316a0 100644
--- a/extensions/positron-python/src/test/debugger/extension/adapter/remoteLaunchers.unit.test.ts
+++ b/extensions/positron-python/src/test/debugger/extension/adapter/remoteLaunchers.unit.test.ts
@@ -52,7 +52,7 @@ suite('External debugpy Debugger Launcher', () => {
});
suite('Path To Debugger Package', () => {
- const pathToPythonLibDir = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'lib', 'python');
+ const pathToPythonLibDir = path.join(EXTENSION_ROOT_DIR, 'python_files', 'lib', 'python');
test('Path to debugpy debugger package', () => {
const actual = launchers.getDebugpyPackagePath();
const expected = path.join(pathToPythonLibDir, 'debugpy');
diff --git a/extensions/positron-python/src/test/environmentApi.unit.test.ts b/extensions/positron-python/src/test/environmentApi.unit.test.ts
index 1d8dc3e5c84..012e1a0bfc6 100644
--- a/extensions/positron-python/src/test/environmentApi.unit.test.ts
+++ b/extensions/positron-python/src/test/environmentApi.unit.test.ts
@@ -74,8 +74,7 @@ suite('Python Environment API', () => {
envVarsProvider = typemoq.Mock.ofType();
extensions
.setup((e) => e.determineExtensionFromCallStack())
- .returns(() => Promise.resolve({ extensionId: 'id', displayName: 'displayName', apiName: 'apiName' }))
- .verifiable(typemoq.Times.atLeastOnce());
+ .returns(() => Promise.resolve({ extensionId: 'id', displayName: 'displayName', apiName: 'apiName' }));
interpreterPathService = typemoq.Mock.ofType();
configService = typemoq.Mock.ofType();
onDidChangeRefreshState = new EventEmitter();
@@ -94,13 +93,12 @@ suite('Python Environment API', () => {
discoverAPI.setup((d) => d.onProgress).returns(() => onDidChangeRefreshState.event);
discoverAPI.setup((d) => d.onChanged).returns(() => onDidChangeEnvironments.event);
+ discoverAPI.setup((d) => d.getEnvs()).returns(() => []);
environmentApi = buildEnvironmentApi(discoverAPI.object, serviceContainer.object);
});
teardown(() => {
- // Verify each API method sends telemetry regarding who called the API.
- extensions.verifyAll();
sinon.restore();
});
@@ -325,6 +323,7 @@ suite('Python Environment API', () => {
},
];
discoverAPI.setup((d) => d.getEnvs()).returns(() => envs);
+ environmentApi = buildEnvironmentApi(discoverAPI.object, serviceContainer.object);
const actual = environmentApi.known;
const actualEnvs = actual?.map((a) => (a as EnvironmentReference).internal);
assert.deepEqual(
@@ -409,10 +408,10 @@ suite('Python Environment API', () => {
// Update events
events = [];
expectedEvents = [];
- const updatedEnv = cloneDeep(envs[0]);
- updatedEnv.arch = Architecture.x86;
- onDidChangeEnvironments.fire({ old: envs[0], new: updatedEnv });
- expectedEvents.push({ env: convertEnvInfo(updatedEnv), type: 'update' });
+ const updatedEnv0 = cloneDeep(envs[0]);
+ updatedEnv0.arch = Architecture.x86;
+ onDidChangeEnvironments.fire({ old: envs[0], new: updatedEnv0 });
+ expectedEvents.push({ env: convertEnvInfo(updatedEnv0), type: 'update' });
eventValues = events.map((e) => ({ env: (e.env as EnvironmentReference).internal, type: e.type }));
assert.deepEqual(eventValues, expectedEvents);
@@ -423,6 +422,11 @@ suite('Python Environment API', () => {
expectedEvents.push({ env: convertEnvInfo(envs[2]), type: 'remove' });
eventValues = events.map((e) => ({ env: (e.env as EnvironmentReference).internal, type: e.type }));
assert.deepEqual(eventValues, expectedEvents);
+
+ const expectedEnvs = [convertEnvInfo(updatedEnv0), convertEnvInfo(envs[1])].sort();
+ const knownEnvs = environmentApi.known.map((e) => (e as EnvironmentReference).internal).sort();
+
+ assert.deepEqual(expectedEnvs, knownEnvs);
});
test('updateActiveEnvironmentPath: no resource', async () => {
diff --git a/extensions/positron-python/src/test/initialize.ts b/extensions/positron-python/src/test/initialize.ts
index 3937589900b..8430f5781d2 100644
--- a/extensions/positron-python/src/test/initialize.ts
+++ b/extensions/positron-python/src/test/initialize.ts
@@ -17,7 +17,7 @@ import { initializePositron } from './positron/initialize';
export * from './constants';
export * from './ciConstants';
-const dummyPythonFile = path.join(__dirname, '..', '..', 'src', 'test', 'pythonFiles', 'dummy.py');
+const dummyPythonFile = path.join(__dirname, '..', '..', 'src', 'test', 'python_files', 'dummy.py');
export const multirootPath = path.join(__dirname, '..', '..', 'src', 'testMultiRootWkspc');
const workspace3Uri = vscode.Uri.file(path.join(multirootPath, 'workspace3'));
diff --git a/extensions/positron-python/src/test/interpreters/activation/service.unit.test.ts b/extensions/positron-python/src/test/interpreters/activation/service.unit.test.ts
index 9b2c121c89b..a0f9b3bd691 100644
--- a/extensions/positron-python/src/test/interpreters/activation/service.unit.test.ts
+++ b/extensions/positron-python/src/test/interpreters/activation/service.unit.test.ts
@@ -161,7 +161,11 @@ suite('Interpreters Activation - Python Environment Variables', () => {
const shellCmd = capture(processService.shellExec).first()[0];
- const printEnvPyFile = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'printEnvVariables.py');
+ const printEnvPyFile = path.join(
+ EXTENSION_ROOT_DIR,
+ 'python_files',
+ 'printEnvVariables.py',
+ );
const expectedCommand = [
...cmd,
`echo '${getEnvironmentPrefix}'`,
diff --git a/extensions/positron-python/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts b/extensions/positron-python/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts
index bc5cea1f1e6..faa95a08a3c 100644
--- a/extensions/positron-python/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts
+++ b/extensions/positron-python/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts
@@ -38,6 +38,7 @@ import { PathUtils } from '../../../client/common/platform/pathUtils';
import { PythonEnvType } from '../../../client/pythonEnvironments/base/info';
import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
import { IShellIntegrationService, ITerminalDeactivateService } from '../../../client/terminals/types';
+import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
suite('Terminal Environment Variable Collection Service', () => {
let platform: IPlatformService;
@@ -74,6 +75,7 @@ suite('Terminal Environment Variable Collection Service', () => {
interpreterService = mock();
context = mock();
shell = mock();
+ const envVarProvider = mock();
shellIntegrationService = mock();
when(shellIntegrationService.isWorking()).thenResolve(true);
globalCollection = mock();
@@ -113,6 +115,7 @@ suite('Terminal Environment Variable Collection Service', () => {
instance(terminalDeactivateService),
new PathUtils(getOSType() === OSType.Windows),
instance(shellIntegrationService),
+ instance(envVarProvider),
);
});
diff --git a/extensions/positron-python/src/test/interpreters/interpreterPathCommand.unit.test.ts b/extensions/positron-python/src/test/interpreters/interpreterPathCommand.unit.test.ts
index 7001453100e..be94be65486 100644
--- a/extensions/positron-python/src/test/interpreters/interpreterPathCommand.unit.test.ts
+++ b/extensions/positron-python/src/test/interpreters/interpreterPathCommand.unit.test.ts
@@ -64,6 +64,17 @@ suite('Interpreter Path Command', () => {
expect(setting).to.equal('settingValue');
});
+ test('If interpreter path contains spaces, double quote it before returning', async () => {
+ const args = ['command', 'folderPath'];
+ when(interpreterService.getActiveInterpreter(anything())).thenCall((arg) => {
+ assert.deepEqual(arg, Uri.file('folderPath'));
+
+ return Promise.resolve({ path: 'setting Value' }) as unknown;
+ });
+ const setting = await interpreterPathCommand._getSelectedInterpreterPath(args);
+ expect(setting).to.equal('"setting Value"');
+ });
+
test('If neither of these exists, value of workspace folder is `undefined`', async () => {
const args = ['command'];
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/info/envKind.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/info/envKind.unit.test.ts
index fdf174b4c55..997c8a08c7f 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/info/envKind.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/info/envKind.unit.test.ts
@@ -13,6 +13,7 @@ const KIND_NAMES: [PythonEnvKind, string][] = [
[PythonEnvKind.MicrosoftStore, 'winStore'],
[PythonEnvKind.Pyenv, 'pyenv'],
[PythonEnvKind.Poetry, 'poetry'],
+ [PythonEnvKind.Hatch, 'hatch'],
[PythonEnvKind.Custom, 'customGlobal'],
[PythonEnvKind.OtherGlobal, 'otherGlobal'],
[PythonEnvKind.Venv, 'venv'],
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsCollectionService.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsCollectionService.unit.test.ts
index f48d91cf24a..739a3f1a3f4 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsCollectionService.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsCollectionService.unit.test.ts
@@ -78,6 +78,9 @@ suite('Python envs locator - Environments Collection', async () => {
) {
const env = buildEnvInfo({ executable, searchLocation, name, location, kind });
env.id = id ?? env.id;
+ env.version.major = 3;
+ env.version.minor = 10;
+ env.version.micro = 10;
return env;
}
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsResolver.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsResolver.unit.test.ts
index 4a480cfd6e4..5cda8a1cf73 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsResolver.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/composite/envsResolver.unit.test.ts
@@ -57,7 +57,11 @@ suite('Python envs locator - Environments Resolver', () => {
/**
* Returns the expected environment to be returned by Environment info service
*/
- function createExpectedEnvInfo(env: PythonEnvInfo, expectedDisplay: string): PythonEnvInfo {
+ function createExpectedEnvInfo(
+ env: PythonEnvInfo,
+ expectedDisplay: string,
+ expectedDetailedDisplay: string,
+ ): PythonEnvInfo {
const updatedEnv = cloneDeep(env);
updatedEnv.version = {
...parseVersion('3.8.3-final'),
@@ -67,7 +71,7 @@ suite('Python envs locator - Environments Resolver', () => {
updatedEnv.executable.sysPrefix = 'path';
updatedEnv.arch = Architecture.x64;
updatedEnv.display = expectedDisplay;
- updatedEnv.detailedDisplayName = expectedDisplay;
+ updatedEnv.detailedDisplayName = expectedDetailedDisplay;
if (env.kind === PythonEnvKind.Conda) {
env.type = PythonEnvType.Conda;
}
@@ -82,6 +86,7 @@ suite('Python envs locator - Environments Resolver', () => {
location = '',
display: string | undefined = undefined,
type?: PythonEnvType,
+ detailedDisplay?: string,
): PythonEnvInfo {
return {
name,
@@ -94,7 +99,7 @@ suite('Python envs locator - Environments Resolver', () => {
mtime: -1,
},
display,
- detailedDisplayName: display,
+ detailedDisplayName: detailedDisplay ?? display,
version,
arch: Architecture.Unknown,
distro: { org: '' },
@@ -134,8 +139,9 @@ suite('Python envs locator - Environments Resolver', () => {
undefined,
'win1',
path.join(testVirtualHomeDir, '.venvs', 'win1'),
- "Python ('win1': venv)",
+ "Python ('win1')",
PythonEnvType.Virtual,
+ "Python ('win1': venv)",
);
const envsReturnedByParentLocator = [env1];
const parentLocator = new SimpleLocator(envsReturnedByParentLocator);
@@ -170,7 +176,11 @@ suite('Python envs locator - Environments Resolver', () => {
const envs = await getEnvsWithUpdates(iterator);
assertEnvsEqual(envs, [
- createExpectedEnvInfo(resolvedEnvReturnedByBasicResolver, "Python 3.8.3 ('win1': venv)"),
+ createExpectedEnvInfo(
+ resolvedEnvReturnedByBasicResolver,
+ "Python 3.8.3 ('win1')",
+ "Python 3.8.3 ('win1': venv)",
+ ),
]);
});
@@ -237,7 +247,11 @@ suite('Python envs locator - Environments Resolver', () => {
// Assert
assertEnvsEqual(envs, [
- createExpectedEnvInfo(resolvedUpdatedEnvReturnedByBasicResolver, "Python 3.8.3 ('win1': venv)"),
+ createExpectedEnvInfo(
+ resolvedUpdatedEnvReturnedByBasicResolver,
+ "Python 3.8.3 ('win1')",
+ "Python 3.8.3 ('win1': venv)",
+ ),
]);
didUpdate.dispose();
});
@@ -377,7 +391,11 @@ suite('Python envs locator - Environments Resolver', () => {
assertEnvEqual(
expected,
- createExpectedEnvInfo(resolvedEnvReturnedByBasicResolver, "Python 3.8.3 ('win1': venv)"),
+ createExpectedEnvInfo(
+ resolvedEnvReturnedByBasicResolver,
+ "Python 3.8.3 ('win1')",
+ "Python 3.8.3 ('win1': venv)",
+ ),
);
});
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/envTestUtils.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/envTestUtils.ts
index d1099ee4f84..a46dab274b4 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/envTestUtils.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/envTestUtils.ts
@@ -103,10 +103,12 @@ export function assertBasicEnvsEqual(actualEnvs: BasicEnvInfo[], expectedEnvs: B
const [actual, expected] = value;
if (actual) {
actual.source = actual.source ?? [];
+ actual.searchLocation = actual.searchLocation ?? undefined;
actual.source.sort();
}
if (expected) {
expected.source = expected.source ?? [];
+ expected.searchLocation = expected.searchLocation ?? undefined;
expected.source.sort();
}
assert.deepStrictEqual(actual, expected);
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/condaLocator.testvirtualenvs.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/condaLocator.testvirtualenvs.ts
index b3e1084a56b..25a3df90202 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/condaLocator.testvirtualenvs.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/condaLocator.testvirtualenvs.ts
@@ -14,8 +14,6 @@ import { PythonEnvsChangedEvent } from '../../../../../client/pythonEnvironments
import { EXTENSION_ROOT_DIR_FOR_TESTS, TEST_TIMEOUT } from '../../../../constants';
import { traceWarn } from '../../../../../client/logging';
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
-import { getEnvs } from '../../common';
-import { assertBasicEnvsEqual } from '../envTestUtils';
import { PYTHON_VIRTUAL_ENVS_LOCATION } from '../../../../ciConstants';
import { isCI } from '../../../../../client/common/constants';
import * as externalDependencies from '../../../../../client/pythonEnvironments/common/externalDependencies';
@@ -131,14 +129,4 @@ suite('Conda Env Locator', async () => {
assert.deepEqual(actualEvent!, expectedEvent, 'Unexpected event emitted');
});
-
- test('Worker thread to fetch conda environments is working', async () => {
- locator = new CondaEnvironmentLocator();
- const items = await getEnvs(locator.doIterEnvs(undefined, false));
- const workerItems = await getEnvs(locator.doIterEnvs(undefined, true));
- console.log('Number of items Conda locator returned:', items.length);
- // Make sure items returned when using worker threads v/s not are the same.
- assertBasicEnvsEqual(items, workerItems);
- assert(workerItems.length > 0, 'No environments found');
- }).timeout(TEST_TIMEOUT * 2);
});
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.unit.test.ts
index 6998d9f4050..ede947073ea 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvironmentLocator.unit.test.ts
@@ -3,6 +3,7 @@
import * as path from 'path';
import * as sinon from 'sinon';
+import { Uri } from 'vscode';
import * as fsWatcher from '../../../../../client/common/platform/fileSystemWatcher';
import * as platformUtils from '../../../../../client/common/utils/platform';
import { PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
@@ -22,6 +23,7 @@ suite('GlobalVirtualEnvironment Locator', () => {
let readFileStub: sinon.SinonStub;
let locator: GlobalVirtualEnvironmentLocator;
let watchLocationForPatternStub: sinon.SinonStub;
+ const project2 = path.join(TEST_LAYOUT_ROOT, 'pipenv', 'project2');
setup(async () => {
getEnvVariableStub = sinon.stub(platformUtils, 'getEnvironmentVariable');
@@ -49,7 +51,7 @@ suite('GlobalVirtualEnvironment Locator', () => {
'.project',
);
readFileStub = sinon.stub(externalDependencies, 'readFile');
- readFileStub.withArgs(expectedDotProjectFile).returns(path.join(TEST_LAYOUT_ROOT, 'pipenv', 'project2'));
+ readFileStub.withArgs(expectedDotProjectFile).returns(project2);
readFileStub.callThrough();
});
teardown(async () => {
@@ -131,6 +133,11 @@ suite('GlobalVirtualEnvironment Locator', () => {
});
test('iterEnvs(): Non-Windows', async () => {
+ const pipenv = createBasicEnv(
+ PythonEnvKind.Pipenv,
+ path.join(testVirtualHomeDir, '.local', 'share', 'virtualenvs', 'project2-vnNIWe9P', 'bin', 'python'),
+ );
+ pipenv.searchLocation = Uri.file(project2);
const expectedEnvs = [
createBasicEnv(PythonEnvKind.Venv, path.join(testVirtualHomeDir, '.venvs', 'posix1', 'python')),
createBasicEnv(PythonEnvKind.Venv, path.join(testVirtualHomeDir, '.venvs', 'posix2', 'bin', 'python')),
@@ -147,10 +154,7 @@ suite('GlobalVirtualEnvironment Locator', () => {
PythonEnvKind.VirtualEnvWrapper,
path.join(testVirtualHomeDir, 'workonhome', 'posix2', 'bin', 'python'),
),
- createBasicEnv(
- PythonEnvKind.Pipenv,
- path.join(testVirtualHomeDir, '.local', 'share', 'virtualenvs', 'project2-vnNIWe9P', 'bin', 'python'),
- ),
+ pipenv,
];
locator = new GlobalVirtualEnvironmentLocator();
@@ -179,6 +183,11 @@ suite('GlobalVirtualEnvironment Locator', () => {
test('iterEnvs(): Non-Windows (WORKON_HOME not set)', async () => {
getEnvVariableStub.withArgs('WORKON_HOME').returns(undefined);
+ const pipenv = createBasicEnv(
+ PythonEnvKind.Pipenv,
+ path.join(testVirtualHomeDir, '.local', 'share', 'virtualenvs', 'project2-vnNIWe9P', 'bin', 'python'),
+ );
+ pipenv.searchLocation = Uri.file(project2);
const expectedEnvs = [
createBasicEnv(PythonEnvKind.Venv, path.join(testVirtualHomeDir, '.venvs', 'posix1', 'python')),
createBasicEnv(PythonEnvKind.Venv, path.join(testVirtualHomeDir, '.venvs', 'posix2', 'bin', 'python')),
@@ -190,10 +199,7 @@ suite('GlobalVirtualEnvironment Locator', () => {
PythonEnvKind.VirtualEnvWrapper,
path.join(testVirtualHomeDir, '.virtualenvs', 'posix2', 'bin', 'python'),
),
- createBasicEnv(
- PythonEnvKind.Pipenv,
- path.join(testVirtualHomeDir, '.local', 'share', 'virtualenvs', 'project2-vnNIWe9P', 'bin', 'python'),
- ),
+ pipenv,
];
locator = new GlobalVirtualEnvironmentLocator();
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/hatchLocator.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/hatchLocator.unit.test.ts
new file mode 100644
index 00000000000..9a2a69908f2
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/hatchLocator.unit.test.ts
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import * as sinon from 'sinon';
+import * as path from 'path';
+import { PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
+import * as externalDependencies from '../../../../../client/pythonEnvironments/common/externalDependencies';
+import * as platformUtils from '../../../../../client/common/utils/platform';
+import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
+import { HatchLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/hatchLocator';
+import { assertBasicEnvsEqual } from '../envTestUtils';
+import { createBasicEnv } from '../../common';
+import { makeExecHandler, projectDirs, venvDirs } from '../../../common/environmentManagers/hatch.unit.test';
+
+suite('Hatch Locator', () => {
+ let exec: sinon.SinonStub;
+ let getPythonSetting: sinon.SinonStub;
+ let getOSType: sinon.SinonStub;
+ let locator: HatchLocator;
+
+ suiteSetup(() => {
+ getPythonSetting = sinon.stub(externalDependencies, 'getPythonSetting');
+ getPythonSetting.returns('hatch');
+ getOSType = sinon.stub(platformUtils, 'getOSType');
+ exec = sinon.stub(externalDependencies, 'exec');
+ });
+
+ suiteTeardown(() => sinon.restore());
+
+ suite('iterEnvs()', () => {
+ setup(() => {
+ getOSType.returns(platformUtils.OSType.Linux);
+ });
+
+ interface TestArgs {
+ osType?: platformUtils.OSType;
+ pythonBin?: string;
+ }
+
+ const testProj1 = async ({ osType, pythonBin = 'bin/python' }: TestArgs = {}) => {
+ if (osType) {
+ getOSType.returns(osType);
+ }
+
+ locator = new HatchLocator(projectDirs.project1);
+ exec.callsFake(makeExecHandler(venvDirs.project1, { path: true, cwd: projectDirs.project1 }));
+
+ const iterator = locator.iterEnvs();
+ const actualEnvs = await getEnvs(iterator);
+
+ const expectedEnvs = [createBasicEnv(PythonEnvKind.Hatch, path.join(venvDirs.project1.default, pythonBin))];
+ assertBasicEnvsEqual(actualEnvs, expectedEnvs);
+ };
+
+ test('project with only the default env', () => testProj1());
+ test('project with only the default env on Windows', () =>
+ testProj1({
+ osType: platformUtils.OSType.Windows,
+ pythonBin: 'Scripts/python.exe',
+ }));
+
+ test('project with multiple defined envs', async () => {
+ locator = new HatchLocator(projectDirs.project2);
+ exec.callsFake(makeExecHandler(venvDirs.project2, { path: true, cwd: projectDirs.project2 }));
+
+ const iterator = locator.iterEnvs();
+ const actualEnvs = await getEnvs(iterator);
+
+ const expectedEnvs = [
+ createBasicEnv(PythonEnvKind.Hatch, path.join(venvDirs.project2.default, 'bin/python')),
+ createBasicEnv(PythonEnvKind.Hatch, path.join(venvDirs.project2.test, 'bin/python')),
+ ];
+ assertBasicEnvsEqual(actualEnvs, expectedEnvs);
+ });
+ });
+});
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/poetryLocator.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/poetryLocator.unit.test.ts
index 95c1a401df5..e7982a4c4e9 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/poetryLocator.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/poetryLocator.unit.test.ts
@@ -3,7 +3,8 @@
import * as path from 'path';
import * as sinon from 'sinon';
-import { PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
+import { Uri } from 'vscode';
+import { PythonEnvKind, PythonEnvSource } from '../../../../../client/pythonEnvironments/base/info';
import * as externalDependencies from '../../../../../client/pythonEnvironments/common/externalDependencies';
import * as platformUtils from '../../../../../client/common/utils/platform';
import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
@@ -11,7 +12,8 @@ import { PoetryLocator } from '../../../../../client/pythonEnvironments/base/loc
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
import { assertBasicEnvsEqual } from '../envTestUtils';
import { ExecutionResult, ShellOptions } from '../../../../../client/common/process/types';
-import { createBasicEnv } from '../../common';
+import { createBasicEnv as createBasicEnvCommon } from '../../common';
+import { BasicEnvInfo } from '../../../../../client/pythonEnvironments/base/locator';
suite('Poetry Locator', () => {
let shellExecute: sinon.SinonStub;
@@ -31,6 +33,17 @@ suite('Poetry Locator', () => {
suite('Windows', () => {
const project1 = path.join(testPoetryDir, 'project1');
+
+ function createBasicEnv(
+ kind: PythonEnvKind,
+ executablePath: string,
+ source?: PythonEnvSource[],
+ envPath?: string,
+ ): BasicEnvInfo {
+ const basicEnv = createBasicEnvCommon(kind, executablePath, source, envPath);
+ basicEnv.searchLocation = Uri.file(project1);
+ return basicEnv;
+ }
setup(() => {
locator = new PoetryLocator(project1);
getOSTypeStub.returns(platformUtils.OSType.Windows);
@@ -72,6 +85,17 @@ suite('Poetry Locator', () => {
suite('Non-Windows', () => {
const project2 = path.join(testPoetryDir, 'project2');
+
+ function createBasicEnv(
+ kind: PythonEnvKind,
+ executablePath: string,
+ source?: PythonEnvSource[],
+ envPath?: string,
+ ): BasicEnvInfo {
+ const basicEnv = createBasicEnvCommon(kind, executablePath, source, envPath);
+ basicEnv.searchLocation = Uri.file(project2);
+ return basicEnv;
+ }
setup(() => {
locator = new PoetryLocator(project2);
getOSTypeStub.returns(platformUtils.OSType.Linux);
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.testvirtualenvs.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.testvirtualenvs.ts
deleted file mode 100644
index 693d7c1b7fe..00000000000
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.testvirtualenvs.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
-import { WindowsRegistryLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator';
-import { assertBasicEnvsEqual } from '../envTestUtils';
-import { TEST_TIMEOUT } from '../../../../constants';
-import { getOSType, OSType } from '../../../../../client/common/utils/platform';
-
-suite('Windows Registry Locator', async () => {
- let locator: WindowsRegistryLocator;
-
- setup(function () {
- if (getOSType() !== OSType.Windows) {
- return this.skip();
- }
- locator = new WindowsRegistryLocator();
- return undefined;
- });
-
- test('Worker thread to fetch registry interpreters is working', async () => {
- const items = await getEnvs(locator.iterEnvs(undefined, false));
- const workerItems = await getEnvs(locator.iterEnvs(undefined, true));
- console.log('Number of items Windows registry locator returned:', items.length);
- // Make sure items returned when using worker threads v/s not are the same.
- assertBasicEnvsEqual(items, workerItems);
- }).timeout(TEST_TIMEOUT * 2);
-});
diff --git a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.unit.test.ts
index 4197c36fa9f..07a7a864ef7 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator.unit.test.ts
@@ -4,10 +4,14 @@
import * as assert from 'assert';
import * as path from 'path';
import * as sinon from 'sinon';
+import { expect } from 'chai';
import { PythonEnvKind, PythonEnvSource } from '../../../../../client/pythonEnvironments/base/info';
import { getEnvs } from '../../../../../client/pythonEnvironments/base/locatorUtils';
import * as winreg from '../../../../../client/pythonEnvironments/common/windowsRegistry';
-import { WindowsRegistryLocator } from '../../../../../client/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator';
+import {
+ WindowsRegistryLocator,
+ WINDOWS_REG_PROVIDER_ID,
+} from '../../../../../client/pythonEnvironments/base/locators/lowLevel/windowsRegistryLocator';
import { createBasicEnv } from '../../common';
import { TEST_LAYOUT_ROOT } from '../../../common/commonTestConstants';
import { assertBasicEnvsEqual } from '../envTestUtils';
@@ -201,7 +205,7 @@ suite('Windows Registry', () => {
}
setup(async () => {
- sinon.stub(externalDependencies, 'inExperiment').returns(false);
+ sinon.stub(externalDependencies, 'inExperiment').returns(true);
stubReadRegistryValues = sinon.stub(winreg, 'readRegistryValues');
stubReadRegistryKeys = sinon.stub(winreg, 'readRegistryKeys');
stubReadRegistryValues.callsFake(fakeRegistryValues);
@@ -222,18 +226,29 @@ suite('Windows Registry', () => {
createBasicEnv(PythonEnvKind.OtherGlobal, path.join(regTestRoot, 'python38', 'python.exe')),
].map((e) => ({ ...e, source: [PythonEnvSource.WindowsRegistry] }));
- const iterator = locator.iterEnvs(undefined, true);
+ const lazyIterator = locator.iterEnvs(undefined, true);
+ const envs = await getEnvs(lazyIterator);
+ expect(envs.length).to.equal(0);
+
+ const iterator = locator.iterEnvs({ providerId: WINDOWS_REG_PROVIDER_ID }, true);
const actualEnvs = await getEnvs(iterator);
assertBasicEnvsEqual(actualEnvs, expectedEnvs);
});
+ test('iterEnvs(): query is undefined', async () => {
+ // Iterate no envs when query is `undefined`, i.e notify completion immediately.
+ const lazyIterator = locator.iterEnvs(undefined, true);
+ const envs = await getEnvs(lazyIterator);
+ expect(envs.length).to.equal(0);
+ });
+
test('iterEnvs(): no registry permission', async () => {
stubReadRegistryKeys.callsFake(() => {
throw Error();
});
- const iterator = locator.iterEnvs(undefined, true);
+ const iterator = locator.iterEnvs({ providerId: WINDOWS_REG_PROVIDER_ID }, true);
const actualEnvs = await getEnvs(iterator);
assert.deepStrictEqual(actualEnvs, []);
@@ -252,7 +267,7 @@ suite('Windows Registry', () => {
createBasicEnv(PythonEnvKind.OtherGlobal, path.join(regTestRoot, 'python38', 'python.exe')),
].map((e) => ({ ...e, source: [PythonEnvSource.WindowsRegistry] }));
- const iterator = locator.iterEnvs(undefined, true);
+ const iterator = locator.iterEnvs({ providerId: WINDOWS_REG_PROVIDER_ID }, true);
const actualEnvs = await getEnvs(iterator);
assertBasicEnvsEqual(actualEnvs, expectedEnvs);
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/environmentManagers/hatch.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/common/environmentManagers/hatch.unit.test.ts
new file mode 100644
index 00000000000..5d348aa2b13
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/environmentManagers/hatch.unit.test.ts
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { expect } from 'chai';
+import * as path from 'path';
+import * as sinon from 'sinon';
+import { ExecutionResult, ShellOptions } from '../../../../client/common/process/types';
+import * as externalDependencies from '../../../../client/pythonEnvironments/common/externalDependencies';
+import { Hatch } from '../../../../client/pythonEnvironments/common/environmentManagers/hatch';
+import { TEST_LAYOUT_ROOT } from '../commonTestConstants';
+
+export type HatchCommand = { cmd: 'env show --json' } | { cmd: 'env find'; env: string } | { cmd: null };
+
+export function hatchCommand(args: string[]): HatchCommand {
+ if (args.length < 2) {
+ return { cmd: null };
+ }
+ if (args[0] === 'env' && args[1] === 'show' && args[2] === '--json') {
+ return { cmd: 'env show --json' };
+ }
+ if (args[0] === 'env' && args[1] === 'find') {
+ return { cmd: 'env find', env: args[2] };
+ }
+ return { cmd: null };
+}
+
+interface VerifyOptions {
+ path?: boolean;
+ cwd?: string;
+}
+
+export function makeExecHandler(venvDirs: Record, verify: VerifyOptions = {}) {
+ return async (file: string, args: string[], options: ShellOptions): Promise> => {
+ if (verify.path && file !== 'hatch') {
+ throw new Error('Command failed');
+ }
+ if (verify.cwd) {
+ const cwd = typeof options.cwd === 'string' ? options.cwd : options.cwd?.toString();
+ if (!cwd || !externalDependencies.arePathsSame(cwd, verify.cwd)) {
+ throw new Error('Command failed');
+ }
+ }
+ const cmd = hatchCommand(args);
+ if (cmd.cmd === 'env show --json') {
+ const envs = Object.fromEntries(Object.keys(venvDirs).map((name) => [name, { type: 'virtual' }]));
+ return { stdout: JSON.stringify(envs) };
+ }
+ if (cmd.cmd === 'env find' && cmd.env in venvDirs) {
+ return { stdout: venvDirs[cmd.env] };
+ }
+ throw new Error('Command failed');
+ };
+}
+
+const testHatchDir = path.join(TEST_LAYOUT_ROOT, 'hatch');
+// This is usually in /hatch, e.g. `~/.local/share/hatch`
+const hatchEnvsDir = path.join(testHatchDir, 'env/virtual/python');
+export const projectDirs = {
+ project1: path.join(testHatchDir, 'project1'),
+ project2: path.join(testHatchDir, 'project2'),
+};
+export const venvDirs = {
+ project1: { default: path.join(hatchEnvsDir, 'cK2g6fIm/project1') },
+ project2: {
+ default: path.join(hatchEnvsDir, 'q4In3tK-/project2'),
+ test: path.join(hatchEnvsDir, 'q4In3tK-/test'),
+ },
+};
+
+suite('Hatch binary is located correctly', async () => {
+ let exec: sinon.SinonStub;
+ let getPythonSetting: sinon.SinonStub;
+
+ setup(() => {
+ getPythonSetting = sinon.stub(externalDependencies, 'getPythonSetting');
+ exec = sinon.stub(externalDependencies, 'exec');
+ });
+
+ teardown(() => {
+ sinon.restore();
+ });
+
+ const testPath = async (verify = true) => {
+ // If `verify` is false, don’t verify that the command has been called with that path
+ exec.callsFake(
+ makeExecHandler(venvDirs.project1, verify ? { path: true, cwd: projectDirs.project1 } : undefined),
+ );
+ const hatch = await Hatch.getHatch(projectDirs.project1);
+ expect(hatch?.command).to.equal('hatch');
+ };
+
+ test('Use Hatch on PATH if available', () => testPath());
+
+ test('Return undefined if Hatch cannot be found', async () => {
+ getPythonSetting.returns('hatch');
+ exec.callsFake((_file: string, _args: string[], _options: ShellOptions) =>
+ Promise.reject(new Error('Command failed')),
+ );
+ const hatch = await Hatch.getHatch(projectDirs.project1);
+ expect(hatch?.command).to.equal(undefined);
+ });
+});
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/Scripts/python.exe b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/Scripts/python.exe
new file mode 100644
index 00000000000..a37b666d049
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/Scripts/python.exe
@@ -0,0 +1 @@
+Not real python exe
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/bin/python b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/bin/python
rename to extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/bin/python
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/pyvenv.cfg b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/pyvenv.cfg
new file mode 100644
index 00000000000..365d6f5eace
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/cK2g6fIm/project1/pyvenv.cfg
@@ -0,0 +1,3 @@
+home = /usr/bin/python3.11
+include-system-site-packages = false
+version = 3.11.1
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/envs/numpy/bin/python b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/project2/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/envs/numpy/bin/python
rename to extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/project2/bin/python
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/project2/pyvenv.cfg b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/project2/pyvenv.cfg
new file mode 100644
index 00000000000..a67a28be91b
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/project2/pyvenv.cfg
@@ -0,0 +1,3 @@
+home = /usr/bin/python3.10
+include-system-site-packages = false
+version = 3.10.3
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/envs/scipy/bin/python b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/test/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/envs/scipy/bin/python
rename to extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/test/bin/python
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/test/pyvenv.cfg b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/test/pyvenv.cfg
new file mode 100644
index 00000000000..a67a28be91b
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/env/virtual/python/q4In3tK-/test/pyvenv.cfg
@@ -0,0 +1,3 @@
+home = /usr/bin/python3.10
+include-system-site-packages = false
+version = 3.10.3
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/envs/numpy/python.exe b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/project1/.gitkeep
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/envs/numpy/python.exe
rename to extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/project1/.gitkeep
diff --git a/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/project2/hatch.toml b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/project2/hatch.toml
new file mode 100644
index 00000000000..9848374b54f
--- /dev/null
+++ b/extensions/positron-python/src/test/pythonEnvironments/common/envlayouts/hatch/project2/hatch.toml
@@ -0,0 +1,6 @@
+# this file is not actually used in tests, as all is mocked out
+
+# The default environment always exists
+#[envs.default]
+
+[envs.test]
diff --git a/extensions/positron-python/src/test/pythonEnvironments/info/interpreter.unit.test.ts b/extensions/positron-python/src/test/pythonEnvironments/info/interpreter.unit.test.ts
index 38a916d1db9..967454dd6c7 100644
--- a/extensions/positron-python/src/test/pythonEnvironments/info/interpreter.unit.test.ts
+++ b/extensions/positron-python/src/test/pythonEnvironments/info/interpreter.unit.test.ts
@@ -11,7 +11,7 @@ import { buildPythonExecInfo } from '../../../client/pythonEnvironments/exec';
import { getInterpreterInfo } from '../../../client/pythonEnvironments/info/interpreter';
import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../constants';
-const script = pathJoin(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'interpreterInfo.py');
+const script = pathJoin(EXTENSION_ROOT_DIR_FOR_TESTS, 'python_files', 'interpreterInfo.py');
suite('extractInterpreterInfo()', () => {
// Tests go here.
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/autoPep8Formatted.py b/extensions/positron-python/src/test/pythonFiles/formatting/autoPep8Formatted.py
deleted file mode 100644
index e63158d6d4f..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/autoPep8Formatted.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-import math
-import sys
-
-
-def example1():
- # This is a long comment. This should be wrapped to fit within 72 characters.
- some_tuple = (1, 2, 3, 'a')
- some_variable = {'long': 'Long code lines should be wrapped within 79 characters.',
- 'other': [math.pi, 100, 200, 300, 9876543210, 'This is a long string that goes on'],
- 'more': {'inner': 'This whole logical line should be wrapped.', some_tuple: [1,
- 20, 300, 40000, 500000000, 60000000000000000]}}
- return (some_tuple, some_variable)
-
-
-def example2(): return {'has_key() is deprecated': True}.has_key(
- {'f': 2}.has_key(''))
-
-
-class Example3(object):
- def __init__(self, bar):
- # Comments should have a space after the hash.
- if bar:
- bar += 1
- bar = bar * bar
- return bar
- else:
- some_string = """
- Indentation in multiline strings should not be touched.
-Only actual code should be reindented.
-"""
- return (sys.path, some_string)
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/autopep8.output b/extensions/positron-python/src/test/pythonFiles/formatting/autopep8.output
deleted file mode 100644
index 80cb3a44581..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/autopep8.output
+++ /dev/null
@@ -1,50 +0,0 @@
---- original/C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py
-+++ fixed/C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py
-@@ -1,22 +1,32 @@
-
--import math, sys;
-+import math
-+import sys
-+
-
- def example1():
-- ####This is a long comment. This should be wrapped to fit within 72 characters.
-- some_tuple=( 1,2, 3,'a' );
-- some_variable={'long':'Long code lines should be wrapped within 79 characters.',
-- 'other':[math.pi, 100,200,300,9876543210,'This is a long string that goes on'],
-- 'more':{'inner':'This whole logical line should be wrapped.',some_tuple:[1,
-- 20,300,40000,500000000,60000000000000000]}}
-+ # This is a long comment. This should be wrapped to fit within 72 characters.
-+ some_tuple = (1, 2, 3, 'a')
-+ some_variable = {'long': 'Long code lines should be wrapped within 79 characters.',
-+ 'other': [math.pi, 100, 200, 300, 9876543210, 'This is a long string that goes on'],
-+ 'more': {'inner': 'This whole logical line should be wrapped.', some_tuple: [1,
-+ 20, 300, 40000, 500000000, 60000000000000000]}}
- return (some_tuple, some_variable)
--def example2(): return {'has_key() is deprecated':True}.has_key({'f':2}.has_key(''));
--class Example3( object ):
-- def __init__ ( self, bar ):
-- #Comments should have a space after the hash.
-- if bar : bar+=1; bar=bar* bar ; return bar
-- else:
-- some_string = """
-+
-+
-+def example2(): return {'has_key() is deprecated': True}.has_key(
-+ {'f': 2}.has_key(''))
-+
-+
-+class Example3(object):
-+ def __init__(self, bar):
-+ # Comments should have a space after the hash.
-+ if bar:
-+ bar += 1
-+ bar = bar * bar
-+ return bar
-+ else:
-+ some_string = """
- Indentation in multiline strings should not be touched.
- Only actual code should be reindented.
- """
-- return (sys.path, some_string)
-+ return (sys.path, some_string)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/black.output b/extensions/positron-python/src/test/pythonFiles/formatting/black.output
deleted file mode 100644
index 4c14d61f2b9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/black.output
+++ /dev/null
@@ -1,59 +0,0 @@
---- C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py 2020-05-11 18:56:39.835398 +0000
-+++ C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py 2020-05-11 19:05:50.969508 +0000
-@@ -1,23 +1,42 @@
-+import math, sys
-
--import math, sys;
-
- def example1():
- ####This is a long comment. This should be wrapped to fit within 72 characters.
-- some_tuple=( 1,2, 3,'a' );
-- some_variable={'long':'Long code lines should be wrapped within 79 characters.',
-- 'other':[math.pi, 100,200,300,9876543210,'This is a long string that goes on'],
-- 'more':{'inner':'This whole logical line should be wrapped.',some_tuple:[1,
-- 20,300,40000,500000000,60000000000000000]}}
-+ some_tuple = (1, 2, 3, "a")
-+ some_variable = {
-+ "long": "Long code lines should be wrapped within 79 characters.",
-+ "other": [
-+ math.pi,
-+ 100,
-+ 200,
-+ 300,
-+ 9876543210,
-+ "This is a long string that goes on",
-+ ],
-+ "more": {
-+ "inner": "This whole logical line should be wrapped.",
-+ some_tuple: [1, 20, 300, 40000, 500000000, 60000000000000000],
-+ },
-+ }
- return (some_tuple, some_variable)
--def example2(): return {'has_key() is deprecated':True}.has_key({'f':2}.has_key(''));
--class Example3( object ):
-- def __init__ ( self, bar ):
-- #Comments should have a space after the hash.
-- if bar : bar+=1; bar=bar* bar ; return bar
-- else:
-- some_string = """
-+
-+
-+def example2():
-+ return {"has_key() is deprecated": True}.has_key({"f": 2}.has_key(""))
-+
-+
-+class Example3(object):
-+ def __init__(self, bar):
-+ # Comments should have a space after the hash.
-+ if bar:
-+ bar += 1
-+ bar = bar * bar
-+ return bar
-+ else:
-+ some_string = """
- Indentation in multiline strings should not be touched.
- Only actual code should be reindented.
- """
-- return (sys.path, some_string)
-+ return (sys.path, some_string)
-
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/blackFormatted.py b/extensions/positron-python/src/test/pythonFiles/formatting/blackFormatted.py
deleted file mode 100644
index e7bca8b1298..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/blackFormatted.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import math, sys
-
-
-def example1():
- ####This is a long comment. This should be wrapped to fit within 72 characters.
- some_tuple = (1, 2, 3, "a")
- some_variable = {
- "long": "Long code lines should be wrapped within 79 characters.",
- "other": [
- math.pi,
- 100,
- 200,
- 300,
- 9876543210,
- "This is a long string that goes on",
- ],
- "more": {
- "inner": "This whole logical line should be wrapped.",
- some_tuple: [1, 20, 300, 40000, 500000000, 60000000000000000],
- },
- }
- return (some_tuple, some_variable)
-
-
-def example2():
- return {"has_key() is deprecated": True}.has_key({"f": 2}.has_key(""))
-
-
-class Example3(object):
- def __init__(self, bar):
- # Comments should have a space after the hash.
- if bar:
- bar += 1
- bar = bar * bar
- return bar
- else:
- some_string = """
- Indentation in multiline strings should not be touched.
-Only actual code should be reindented.
-"""
- return (sys.path, some_string)
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/dummy.ts b/extensions/positron-python/src/test/pythonFiles/formatting/dummy.ts
deleted file mode 100644
index cbab6669e3b..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/dummy.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Dummy ts file to ensure this folder gets created in output directory.
-
-// Code to ensure linter doesn't complain about empty files.
-const a = '1';
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormat.py b/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormat.py
deleted file mode 100644
index 5b544bd8504..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormat.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import math, sys;
-
-def example1():
- ####This is a long comment. This should be wrapped to fit within 72 characters.
- some_tuple=( 1,2, 3,'a' );
- some_variable={'long':'Long code lines should be wrapped within 79 characters.',
- 'other':[math.pi, 100,200,300,9876543210,'This is a long string that goes on'],
- 'more':{'inner':'This whole logical line should be wrapped.',some_tuple:[1,
- 20,300,40000,500000000,60000000000000000]}}
- return (some_tuple, some_variable)
-def example2(): return {'has_key() is deprecated':True}.has_key({'f':2}.has_key(''));
-class Example3( object ):
- def __init__ ( self, bar ):
- #Comments should have a space after the hash.
- if bar : bar+=1; bar=bar* bar ; return bar
- else:
- some_string = """
- Indentation in multiline strings should not be touched.
-Only actual code should be reindented.
-"""
- return (sys.path, some_string)
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormatOnEnter.py b/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormatOnEnter.py
deleted file mode 100644
index 8adfd1fa123..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/fileToFormatOnEnter.py
+++ /dev/null
@@ -1,13 +0,0 @@
-x=1
-"""x=1
-"""
- # comment
-# x=1
-x+1 #
-@x
-x.y
-if x<=1:
-if 1<=x:
-def __init__(self, age = 23)
-while(1)
-x+"""
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirty.py b/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirty.py
deleted file mode 100644
index 3fe1b80fde8..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirty.py
+++ /dev/null
@@ -1,3 +0,0 @@
-x = 0
-if x > 0:
- x = 1
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirtyResult.py b/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirtyResult.py
deleted file mode 100644
index d0ae06a2a59..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/formatWhenDirtyResult.py
+++ /dev/null
@@ -1,3 +0,0 @@
-x = 0
-if x > 0:
- x = 1
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/pythonGrammar.py b/extensions/positron-python/src/test/pythonFiles/formatting/pythonGrammar.py
deleted file mode 100644
index 937cba401d3..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/pythonGrammar.py
+++ /dev/null
@@ -1,1572 +0,0 @@
-# Python test set -- part 1, grammar.
-# This just tests whether the parser accepts them all.
-
-from test.support import check_syntax_error
-import inspect
-import unittest
-import sys
-# testing import *
-from sys import *
-
-# different import patterns to check that __annotations__ does not interfere
-# with import machinery
-import test.ann_module as ann_module
-import typing
-from collections import ChainMap
-from test import ann_module2
-import test
-
-# These are shared with test_tokenize and other test modules.
-#
-# Note: since several test cases filter out floats by looking for "e" and ".",
-# don't add hexadecimal literals that contain "e" or "E".
-VALID_UNDERSCORE_LITERALS = [
- '0_0_0',
- '4_2',
- '1_0000_0000',
- '0b1001_0100',
- '0xffff_ffff',
- '0o5_7_7',
- '1_00_00.5',
- '1_00_00.5e5',
- '1_00_00e5_1',
- '1e1_0',
- '.1_4',
- '.1_4e1',
- '0b_0',
- '0x_f',
- '0o_5',
- '1_00_00j',
- '1_00_00.5j',
- '1_00_00e5_1j',
- '.1_4j',
- '(1_2.5+3_3j)',
- '(.5_6j)',
-]
-INVALID_UNDERSCORE_LITERALS = [
- # Trailing underscores:
- '0_',
- '42_',
- '1.4j_',
- '0x_',
- '0b1_',
- '0xf_',
- '0o5_',
- '0 if 1_Else 1',
- # Underscores in the base selector:
- '0_b0',
- '0_xf',
- '0_o5',
- # Old-style octal, still disallowed:
- '0_7',
- '09_99',
- # Multiple consecutive underscores:
- '4_______2',
- '0.1__4',
- '0.1__4j',
- '0b1001__0100',
- '0xffff__ffff',
- '0x___',
- '0o5__77',
- '1e1__0',
- '1e1__0j',
- # Underscore right before a dot:
- '1_.4',
- '1_.4j',
- # Underscore right after a dot:
- '1._4',
- '1._4j',
- '._5',
- '._5j',
- # Underscore right after a sign:
- '1.0e+_1',
- '1.0e+_1j',
- # Underscore right before j:
- '1.4_j',
- '1.4e5_j',
- # Underscore right before e:
- '1_e1',
- '1.4_e1',
- '1.4_e1j',
- # Underscore right after e:
- '1e_1',
- '1.4e_1',
- '1.4e_1j',
- # Complex cases with parens:
- '(1+1.5_j_)',
- '(1+1.5_j)',
-]
-
-
-class TokenTests(unittest.TestCase):
-
- def test_backslash(self):
- # Backslash means line continuation:
- x = 1 \
- + 1
- self.assertEqual(x, 2, 'backslash for line continuation')
-
- # Backslash does not means continuation in comments :\
- x = 0
- self.assertEqual(x, 0, 'backslash ending comment')
-
- def test_plain_integers(self):
- self.assertEqual(type(000), type(0))
- self.assertEqual(0xff, 255)
- self.assertEqual(0o377, 255)
- self.assertEqual(2147483647, 0o17777777777)
- self.assertEqual(0b1001, 9)
- # "0x" is not a valid literal
- self.assertRaises(SyntaxError, eval, "0x")
- from sys import maxsize
- if maxsize == 2147483647:
- self.assertEqual(-2147483647 - 1, -0o20000000000)
- # XXX -2147483648
- self.assertTrue(0o37777777777 > 0)
- self.assertTrue(0xffffffff > 0)
- self.assertTrue(0b1111111111111111111111111111111 > 0)
- for s in ('2147483648', '0o40000000000', '0x100000000',
- '0b10000000000000000000000000000000'):
- try:
- x = eval(s)
- except OverflowError:
- self.fail("OverflowError on huge integer literal %r" % s)
- elif maxsize == 9223372036854775807:
- self.assertEqual(-9223372036854775807 - 1, -0o1000000000000000000000)
- self.assertTrue(0o1777777777777777777777 > 0)
- self.assertTrue(0xffffffffffffffff > 0)
- self.assertTrue(0b11111111111111111111111111111111111111111111111111111111111111 > 0)
- for s in '9223372036854775808', '0o2000000000000000000000', \
- '0x10000000000000000', \
- '0b100000000000000000000000000000000000000000000000000000000000000':
- try:
- x = eval(s)
- except OverflowError:
- self.fail("OverflowError on huge integer literal %r" % s)
- else:
- self.fail('Weird maxsize value %r' % maxsize)
-
- def test_long_integers(self):
- x = 0
- x = 0xffffffffffffffff
- x = 0Xffffffffffffffff
- x = 0o77777777777777777
- x = 0O77777777777777777
- x = 123456789012345678901234567890
- x = 0b100000000000000000000000000000000000000000000000000000000000000000000
- x = 0B111111111111111111111111111111111111111111111111111111111111111111111
-
- def test_floats(self):
- x = 3.14
- x = 314.
- x = 0.314
- # XXX x = 000.314
- x = .314
- x = 3e14
- x = 3E14
- x = 3e-14
- x = 3e+14
- x = 3.e14
- x = .3e14
- x = 3.1e4
-
- def test_float_exponent_tokenization(self):
- # See issue 21642.
- self.assertEqual(1 if 1 else 0, 1)
- self.assertEqual(1 if 0 else 0, 0)
- self.assertRaises(SyntaxError, eval, "0 if 1Else 0")
-
- def test_underscore_literals(self):
- for lit in VALID_UNDERSCORE_LITERALS:
- self.assertEqual(eval(lit), eval(lit.replace('_', '')))
- for lit in INVALID_UNDERSCORE_LITERALS:
- self.assertRaises(SyntaxError, eval, lit)
- # Sanity check: no literal begins with an underscore
- self.assertRaises(NameError, eval, "_0")
-
- def test_string_literals(self):
- x = ''; y = ""; self.assertTrue(len(x) == 0 and x == y)
- x = '\''; y = "'"; self.assertTrue(len(x) == 1 and x == y and ord(x) == 39)
- x = '"'; y = "\""; self.assertTrue(len(x) == 1 and x == y and ord(x) == 34)
- x = "doesn't \"shrink\" does it"
- y = 'doesn\'t "shrink" does it'
- self.assertTrue(len(x) == 24 and x == y)
- x = "does \"shrink\" doesn't it"
- y = 'does "shrink" doesn\'t it'
- self.assertTrue(len(x) == 24 and x == y)
- x = """
-The "quick"
-brown fox
-jumps over
-the 'lazy' dog.
-"""
- y = '\nThe "quick"\nbrown fox\njumps over\nthe \'lazy\' dog.\n'
- self.assertEqual(x, y)
- y = '''
-The "quick"
-brown fox
-jumps over
-the 'lazy' dog.
-'''
- self.assertEqual(x, y)
- y = "\n\
-The \"quick\"\n\
-brown fox\n\
-jumps over\n\
-the 'lazy' dog.\n\
-"
- self.assertEqual(x, y)
- y = '\n\
-The \"quick\"\n\
-brown fox\n\
-jumps over\n\
-the \'lazy\' dog.\n\
-'
- self.assertEqual(x, y)
-
- def test_ellipsis(self):
- x = ...
- self.assertTrue(x is Ellipsis)
- self.assertRaises(SyntaxError, eval, ".. .")
-
- def test_eof_error(self):
- samples = ("def foo(", "\ndef foo(", "def foo(\n")
- for s in samples:
- with self.assertRaises(SyntaxError) as cm:
- compile(s, "", "exec")
- self.assertIn("unexpected EOF", str(cm.exception))
-
-var_annot_global: int # a global annotated is necessary for test_var_annot
-
-# custom namespace for testing __annotations__
-
-class CNS:
- def __init__(self):
- self._dct = {}
- def __setitem__(self, item, value):
- self._dct[item.lower()] = value
- def __getitem__(self, item):
- return self._dct[item]
-
-
-class GrammarTests(unittest.TestCase):
-
- check_syntax_error = check_syntax_error
-
- # single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
- # XXX can't test in a script -- this rule is only used when interactive
-
- # file_input: (NEWLINE | stmt)* ENDMARKER
- # Being tested as this very moment this very module
-
- # expr_input: testlist NEWLINE
- # XXX Hard to test -- used only in calls to input()
-
- def test_eval_input(self):
- # testlist ENDMARKER
- x = eval('1, 0 or 1')
-
- def test_var_annot_basics(self):
- # all these should be allowed
- var1: int = 5
- var2: [int, str]
- my_lst = [42]
- def one():
- return 1
- int.new_attr: int
- [list][0]: type
- my_lst[one() - 1]: int = 5
- self.assertEqual(my_lst, [5])
-
- def test_var_annot_syntax_errors(self):
- # parser pass
- check_syntax_error(self, "def f: int")
- check_syntax_error(self, "x: int: str")
- check_syntax_error(self, "def f():\n"
- " nonlocal x: int\n")
- # AST pass
- check_syntax_error(self, "[x, 0]: int\n")
- check_syntax_error(self, "f(): int\n")
- check_syntax_error(self, "(x,): int")
- check_syntax_error(self, "def f():\n"
- " (x, y): int = (1, 2)\n")
- # symtable pass
- check_syntax_error(self, "def f():\n"
- " x: int\n"
- " global x\n")
- check_syntax_error(self, "def f():\n"
- " global x\n"
- " x: int\n")
-
- def test_var_annot_basic_semantics(self):
- # execution order
- with self.assertRaises(ZeroDivisionError):
- no_name[does_not_exist]: no_name_again = 1 / 0
- with self.assertRaises(NameError):
- no_name[does_not_exist]: 1 / 0 = 0
- global var_annot_global
-
- # function semantics
- def f():
- st: str = "Hello"
- a.b: int = (1, 2)
- return st
- self.assertEqual(f.__annotations__, {})
- def f_OK():
- x: 1 / 0
- f_OK()
- def fbad():
- x: int
- print(x)
- with self.assertRaises(UnboundLocalError):
- fbad()
- def f2bad():
- (no_such_global): int
- print(no_such_global)
- try:
- f2bad()
- except Exception as e:
- self.assertIs(type(e), NameError)
-
- # class semantics
- class C:
- __foo: int
- s: str = "attr"
- z = 2
- def __init__(self, x):
- self.x: int = x
- self.assertEqual(C.__annotations__, {'_C__foo': int, 's': str})
- with self.assertRaises(NameError):
- class CBad:
- no_such_name_defined.attr: int = 0
- with self.assertRaises(NameError):
- class Cbad2(C):
- x: int
- x.y: list = []
-
- def test_var_annot_metaclass_semantics(self):
- class CMeta(type):
- @classmethod
- def __prepare__(metacls, name, bases, **kwds):
- return {'__annotations__': CNS()}
- class CC(metaclass=CMeta):
- XX: 'ANNOT'
- self.assertEqual(CC.__annotations__['xx'], 'ANNOT')
-
- def test_var_annot_module_semantics(self):
- with self.assertRaises(AttributeError):
- print(test.__annotations__)
- self.assertEqual(ann_module.__annotations__,
- {1: 2, 'x': int, 'y': str, 'f': typing.Tuple[int, int]})
- self.assertEqual(ann_module.M.__annotations__,
- {'123': 123, 'o': type})
- self.assertEqual(ann_module2.__annotations__, {})
-
- def test_var_annot_in_module(self):
- # check that functions fail the same way when executed
- # outside of module where they were defined
- from test.ann_module3 import f_bad_ann, g_bad_ann, D_bad_ann
- with self.assertRaises(NameError):
- f_bad_ann()
- with self.assertRaises(NameError):
- g_bad_ann()
- with self.assertRaises(NameError):
- D_bad_ann(5)
-
- def test_var_annot_simple_exec(self):
- gns = {}; lns = {}
- exec("'docstring'\n"
- "__annotations__[1] = 2\n"
- "x: int = 5\n", gns, lns)
- self.assertEqual(lns["__annotations__"], {1: 2, 'x': int})
- with self.assertRaises(KeyError):
- gns['__annotations__']
-
- def test_var_annot_custom_maps(self):
- # tests with custom locals() and __annotations__
- ns = {'__annotations__': CNS()}
- exec('X: int; Z: str = "Z"; (w): complex = 1j', ns)
- self.assertEqual(ns['__annotations__']['x'], int)
- self.assertEqual(ns['__annotations__']['z'], str)
- with self.assertRaises(KeyError):
- ns['__annotations__']['w']
- nonloc_ns = {}
- class CNS2:
- def __init__(self):
- self._dct = {}
- def __setitem__(self, item, value):
- nonlocal nonloc_ns
- self._dct[item] = value
- nonloc_ns[item] = value
- def __getitem__(self, item):
- return self._dct[item]
- exec('x: int = 1', {}, CNS2())
- self.assertEqual(nonloc_ns['__annotations__']['x'], int)
-
- def test_var_annot_refleak(self):
- # complex case: custom locals plus custom __annotations__
- # this was causing refleak
- cns = CNS()
- nonloc_ns = {'__annotations__': cns}
- class CNS2:
- def __init__(self):
- self._dct = {'__annotations__': cns}
- def __setitem__(self, item, value):
- nonlocal nonloc_ns
- self._dct[item] = value
- nonloc_ns[item] = value
- def __getitem__(self, item):
- return self._dct[item]
- exec('X: str', {}, CNS2())
- self.assertEqual(nonloc_ns['__annotations__']['x'], str)
-
- def test_funcdef(self):
- ### [decorators] 'def' NAME parameters ['->' test] ':' suite
- ### decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
- ### decorators: decorator+
- ### parameters: '(' [typedargslist] ')'
- ### typedargslist: ((tfpdef ['=' test] ',')*
- ### ('*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef)
- ### | tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
- ### tfpdef: NAME [':' test]
- ### varargslist: ((vfpdef ['=' test] ',')*
- ### ('*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef)
- ### | vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
- ### vfpdef: NAME
- def f1(): pass
- f1()
- f1(*())
- f1(*(), **{})
- def f2(one_argument): pass
- def f3(two, arguments): pass
- self.assertEqual(f2.__code__.co_varnames, ('one_argument',))
- self.assertEqual(f3.__code__.co_varnames, ('two', 'arguments'))
- def a1(one_arg,): pass
- def a2(two, args,): pass
- def v0(*rest): pass
- def v1(a, *rest): pass
- def v2(a, b, *rest): pass
-
- f1()
- f2(1)
- f2(1,)
- f3(1, 2)
- f3(1, 2,)
- v0()
- v0(1)
- v0(1,)
- v0(1, 2)
- v0(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
- v1(1)
- v1(1,)
- v1(1, 2)
- v1(1, 2, 3)
- v1(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
- v2(1, 2)
- v2(1, 2, 3)
- v2(1, 2, 3, 4)
- v2(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
-
- def d01(a=1): pass
- d01()
- d01(1)
- d01(*(1,))
- d01(*[] or [2])
- d01(*() or (), *{} and (), **() or {})
- d01(**{'a': 2})
- d01(**{'a': 2} or {})
- def d11(a, b=1): pass
- d11(1)
- d11(1, 2)
- d11(1, **{'b': 2})
- def d21(a, b, c=1): pass
- d21(1, 2)
- d21(1, 2, 3)
- d21(*(1, 2, 3))
- d21(1, *(2, 3))
- d21(1, 2, *(3,))
- d21(1, 2, **{'c': 3})
- def d02(a=1, b=2): pass
- d02()
- d02(1)
- d02(1, 2)
- d02(*(1, 2))
- d02(1, *(2,))
- d02(1, **{'b': 2})
- d02(**{'a': 1, 'b': 2})
- def d12(a, b=1, c=2): pass
- d12(1)
- d12(1, 2)
- d12(1, 2, 3)
- def d22(a, b, c=1, d=2): pass
- d22(1, 2)
- d22(1, 2, 3)
- d22(1, 2, 3, 4)
- def d01v(a=1, *rest): pass
- d01v()
- d01v(1)
- d01v(1, 2)
- d01v(*(1, 2, 3, 4))
- d01v(*(1,))
- d01v(**{'a': 2})
- def d11v(a, b=1, *rest): pass
- d11v(1)
- d11v(1, 2)
- d11v(1, 2, 3)
- def d21v(a, b, c=1, *rest): pass
- d21v(1, 2)
- d21v(1, 2, 3)
- d21v(1, 2, 3, 4)
- d21v(*(1, 2, 3, 4))
- d21v(1, 2, **{'c': 3})
- def d02v(a=1, b=2, *rest): pass
- d02v()
- d02v(1)
- d02v(1, 2)
- d02v(1, 2, 3)
- d02v(1, *(2, 3, 4))
- d02v(**{'a': 1, 'b': 2})
- def d12v(a, b=1, c=2, *rest): pass
- d12v(1)
- d12v(1, 2)
- d12v(1, 2, 3)
- d12v(1, 2, 3, 4)
- d12v(*(1, 2, 3, 4))
- d12v(1, 2, *(3, 4, 5))
- d12v(1, *(2,), **{'c': 3})
- def d22v(a, b, c=1, d=2, *rest): pass
- d22v(1, 2)
- d22v(1, 2, 3)
- d22v(1, 2, 3, 4)
- d22v(1, 2, 3, 4, 5)
- d22v(*(1, 2, 3, 4))
- d22v(1, 2, *(3, 4, 5))
- d22v(1, *(2, 3), **{'d': 4})
-
- # keyword argument type tests
- try:
- str('x', **{b'foo': 1})
- except TypeError:
- pass
- else:
- self.fail('Bytes should not work as keyword argument names')
- # keyword only argument tests
- def pos0key1(*, key): return key
- pos0key1(key=100)
- def pos2key2(p1, p2, *, k1, k2=100): return p1, p2, k1, k2
- pos2key2(1, 2, k1=100)
- pos2key2(1, 2, k1=100, k2=200)
- pos2key2(1, 2, k2=100, k1=200)
- def pos2key2dict(p1, p2, *, k1=100, k2, **kwarg): return p1, p2, k1, k2, kwarg
- pos2key2dict(1, 2, k2=100, tokwarg1=100, tokwarg2=200)
- pos2key2dict(1, 2, tokwarg1=100, tokwarg2=200, k2=100)
-
- self.assertRaises(SyntaxError, eval, "def f(*): pass")
- self.assertRaises(SyntaxError, eval, "def f(*,): pass")
- self.assertRaises(SyntaxError, eval, "def f(*, **kwds): pass")
-
- # keyword arguments after *arglist
- def f(*args, **kwargs):
- return args, kwargs
- self.assertEqual(f(1, x=2, *[3, 4], y=5), ((1, 3, 4),
- {'x': 2, 'y': 5}))
- self.assertEqual(f(1, *(2, 3), 4), ((1, 2, 3, 4), {}))
- self.assertRaises(SyntaxError, eval, "f(1, x=2, *(3,4), x=5)")
- self.assertEqual(f(**{'eggs': 'scrambled', 'spam': 'fried'}),
- ((), {'eggs': 'scrambled', 'spam': 'fried'}))
- self.assertEqual(f(spam='fried', **{'eggs': 'scrambled'}),
- ((), {'eggs': 'scrambled', 'spam': 'fried'}))
-
- # Check ast errors in *args and *kwargs
- check_syntax_error(self, "f(*g(1=2))")
- check_syntax_error(self, "f(**g(1=2))")
-
- # argument annotation tests
- def f(x) -> list: pass
- self.assertEqual(f.__annotations__, {'return': list})
- def f(x: int): pass
- self.assertEqual(f.__annotations__, {'x': int})
- def f(*x: str): pass
- self.assertEqual(f.__annotations__, {'x': str})
- def f(**x: float): pass
- self.assertEqual(f.__annotations__, {'x': float})
- def f(x, y: 1 + 2): pass
- self.assertEqual(f.__annotations__, {'y': 3})
- def f(a, b: 1, c: 2, d): pass
- self.assertEqual(f.__annotations__, {'b': 1, 'c': 2})
- def f(a, b: 1, c: 2, d, e: 3 = 4, f=5, *g: 6): pass
- self.assertEqual(f.__annotations__,
- {'b': 1, 'c': 2, 'e': 3, 'g': 6})
- def f(a, b: 1, c: 2, d, e: 3 = 4, f=5, *g: 6, h: 7, i=8, j: 9 = 10,
- **k: 11) -> 12: pass
- self.assertEqual(f.__annotations__,
- {'b': 1, 'c': 2, 'e': 3, 'g': 6, 'h': 7, 'j': 9,
- 'k': 11, 'return': 12})
- # Check for issue #20625 -- annotations mangling
- class Spam:
- def f(self, *, __kw: 1):
- pass
- class Ham(Spam): pass
- self.assertEqual(Spam.f.__annotations__, {'_Spam__kw': 1})
- self.assertEqual(Ham.f.__annotations__, {'_Spam__kw': 1})
- # Check for SF Bug #1697248 - mixing decorators and a return annotation
- def null(x): return x
- @null
- def f(x) -> list: pass
- self.assertEqual(f.__annotations__, {'return': list})
-
- # test closures with a variety of opargs
- closure = 1
- def f(): return closure
- def f(x=1): return closure
- def f(*, k=1): return closure
- def f() -> int: return closure
-
- # Check trailing commas are permitted in funcdef argument list
- def f(a,): pass
- def f(*args,): pass
- def f(**kwds,): pass
- def f(a, *args,): pass
- def f(a, **kwds,): pass
- def f(*args, b,): pass
- def f(*, b,): pass
- def f(*args, **kwds,): pass
- def f(a, *args, b,): pass
- def f(a, *, b,): pass
- def f(a, *args, **kwds,): pass
- def f(*args, b, **kwds,): pass
- def f(*, b, **kwds,): pass
- def f(a, *args, b, **kwds,): pass
- def f(a, *, b, **kwds,): pass
-
- def test_lambdef(self):
- ### lambdef: 'lambda' [varargslist] ':' test
- l1 = lambda: 0
- self.assertEqual(l1(), 0)
- l2 = lambda: a[d] # XXX just testing the expression
- l3 = lambda: [2 < x for x in [-1, 3, 0]]
- self.assertEqual(l3(), [0, 1, 0])
- l4 = lambda x=lambda y=lambda z=1: z: y(): x()
- self.assertEqual(l4(), 1)
- l5 = lambda x, y, z=2: x + y + z
- self.assertEqual(l5(1, 2), 5)
- self.assertEqual(l5(1, 2, 3), 6)
- check_syntax_error(self, "lambda x: x = 2")
- check_syntax_error(self, "lambda (None,): None")
- l6 = lambda x, y, *, k=20: x + y + k
- self.assertEqual(l6(1, 2), 1 + 2 + 20)
- self.assertEqual(l6(1, 2, k=10), 1 + 2 + 10)
-
- # check that trailing commas are permitted
- l10 = lambda a,: 0
- l11 = lambda *args,: 0
- l12 = lambda **kwds,: 0
- l13 = lambda a, *args,: 0
- l14 = lambda a, **kwds,: 0
- l15 = lambda *args, b,: 0
- l16 = lambda *, b,: 0
- l17 = lambda *args, **kwds,: 0
- l18 = lambda a, *args, b,: 0
- l19 = lambda a, *, b,: 0
- l20 = lambda a, *args, **kwds,: 0
- l21 = lambda *args, b, **kwds,: 0
- l22 = lambda *, b, **kwds,: 0
- l23 = lambda a, *args, b, **kwds,: 0
- l24 = lambda a, *, b, **kwds,: 0
-
-
- ### stmt: simple_stmt | compound_stmt
- # Tested below
-
- def test_simple_stmt(self):
- ### simple_stmt: small_stmt (';' small_stmt)* [';']
- x = 1; pass; del x
- def foo():
- # verify statements that end with semi-colons
- x = 1; pass; del x;
- foo()
-
- ### small_stmt: expr_stmt | pass_stmt | del_stmt | flow_stmt | import_stmt | global_stmt | access_stmt
- # Tested below
-
- def test_expr_stmt(self):
- # (exprlist '=')* exprlist
- 1
- 1, 2, 3
- x = 1
- x = 1, 2, 3
- x = y = z = 1, 2, 3
- x, y, z = 1, 2, 3
- abc = a, b, c = x, y, z = xyz = 1, 2, (3, 4)
-
- check_syntax_error(self, "x + 1 = 1")
- check_syntax_error(self, "a + 1 = b + 2")
-
- # Check the heuristic for print & exec covers significant cases
- # As well as placing some limits on false positives
- def test_former_statements_refer_to_builtins(self):
- keywords = "print", "exec"
- # Cases where we want the custom error
- cases = [
- "{} foo",
- "{} {{1:foo}}",
- "if 1: {} foo",
- "if 1: {} {{1:foo}}",
- "if 1:\n {} foo",
- "if 1:\n {} {{1:foo}}",
- ]
- for keyword in keywords:
- custom_msg = "call to '{}'".format(keyword)
- for case in cases:
- source = case.format(keyword)
- with self.subTest(source=source):
- with self.assertRaisesRegex(SyntaxError, custom_msg):
- exec(source)
- source = source.replace("foo", "(foo.)")
- with self.subTest(source=source):
- with self.assertRaisesRegex(SyntaxError, "invalid syntax"):
- exec(source)
-
- def test_del_stmt(self):
- # 'del' exprlist
- abc = [1, 2, 3]
- x, y, z = abc
- xyz = x, y, z
-
- del abc
- del x, y, (z, xyz)
-
- def test_pass_stmt(self):
- # 'pass'
- pass
-
- # flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt
- # Tested below
-
- def test_break_stmt(self):
- # 'break'
- while 1: break
-
- def test_continue_stmt(self):
- # 'continue'
- i = 1
- while i: i = 0; continue
-
- msg = ""
- while not msg:
- msg = "ok"
- try:
- continue
- msg = "continue failed to continue inside try"
- except:
- msg = "continue inside try called except block"
- if msg != "ok":
- self.fail(msg)
-
- msg = ""
- while not msg:
- msg = "finally block not called"
- try:
- continue
- finally:
- msg = "ok"
- if msg != "ok":
- self.fail(msg)
-
- def test_break_continue_loop(self):
- # This test warrants an explanation. It is a test specifically for SF bugs
- # #463359 and #462937. The bug is that a 'break' statement executed or
- # exception raised inside a try/except inside a loop, *after* a continue
- # statement has been executed in that loop, will cause the wrong number of
- # arguments to be popped off the stack and the instruction pointer reset to
- # a very small number (usually 0.) Because of this, the following test
- # *must* written as a function, and the tracking vars *must* be function
- # arguments with default values. Otherwise, the test will loop and loop.
-
- def test_inner(extra_burning_oil=1, count=0):
- big_hippo = 2
- while big_hippo:
- count += 1
- try:
- if extra_burning_oil and big_hippo == 1:
- extra_burning_oil -= 1
- break
- big_hippo -= 1
- continue
- except:
- raise
- if count > 2 or big_hippo != 1:
- self.fail("continue then break in try/except in loop broken!")
- test_inner()
-
- def test_return(self):
- # 'return' [testlist]
- def g1(): return
- def g2(): return 1
- g1()
- x = g2()
- check_syntax_error(self, "class foo:return 1")
-
- def test_break_in_finally(self):
- count = 0
- while count < 2:
- count += 1
- try:
- pass
- finally:
- break
- self.assertEqual(count, 1)
-
- count = 0
- while count < 2:
- count += 1
- try:
- continue
- finally:
- break
- self.assertEqual(count, 1)
-
- count = 0
- while count < 2:
- count += 1
- try:
- 1 / 0
- finally:
- break
- self.assertEqual(count, 1)
-
- for count in [0, 1]:
- self.assertEqual(count, 0)
- try:
- pass
- finally:
- break
- self.assertEqual(count, 0)
-
- for count in [0, 1]:
- self.assertEqual(count, 0)
- try:
- continue
- finally:
- break
- self.assertEqual(count, 0)
-
- for count in [0, 1]:
- self.assertEqual(count, 0)
- try:
- 1 / 0
- finally:
- break
- self.assertEqual(count, 0)
-
- def test_continue_in_finally(self):
- count = 0
- while count < 2:
- count += 1
- try:
- pass
- finally:
- continue
- break
- self.assertEqual(count, 2)
-
- count = 0
- while count < 2:
- count += 1
- try:
- break
- finally:
- continue
- self.assertEqual(count, 2)
-
- count = 0
- while count < 2:
- count += 1
- try:
- 1 / 0
- finally:
- continue
- break
- self.assertEqual(count, 2)
-
- for count in [0, 1]:
- try:
- pass
- finally:
- continue
- break
- self.assertEqual(count, 1)
-
- for count in [0, 1]:
- try:
- break
- finally:
- continue
- self.assertEqual(count, 1)
-
- for count in [0, 1]:
- try:
- 1 / 0
- finally:
- continue
- break
- self.assertEqual(count, 1)
-
- def test_return_in_finally(self):
- def g1():
- try:
- pass
- finally:
- return 1
- self.assertEqual(g1(), 1)
-
- def g2():
- try:
- return 2
- finally:
- return 3
- self.assertEqual(g2(), 3)
-
- def g3():
- try:
- 1 / 0
- finally:
- return 4
- self.assertEqual(g3(), 4)
-
- def test_yield(self):
- # Allowed as standalone statement
- def g(): yield 1
- def g(): yield from ()
- # Allowed as RHS of assignment
- def g(): x = yield 1
- def g(): x = yield from ()
- # Ordinary yield accepts implicit tuples
- def g(): yield 1, 1
- def g(): x = yield 1, 1
- # 'yield from' does not
- check_syntax_error(self, "def g(): yield from (), 1")
- check_syntax_error(self, "def g(): x = yield from (), 1")
- # Requires parentheses as subexpression
- def g(): 1, (yield 1)
- def g(): 1, (yield from ())
- check_syntax_error(self, "def g(): 1, yield 1")
- check_syntax_error(self, "def g(): 1, yield from ()")
- # Requires parentheses as call argument
- def g(): f((yield 1))
- def g(): f((yield 1), 1)
- def g(): f((yield from ()))
- def g(): f((yield from ()), 1)
- check_syntax_error(self, "def g(): f(yield 1)")
- check_syntax_error(self, "def g(): f(yield 1, 1)")
- check_syntax_error(self, "def g(): f(yield from ())")
- check_syntax_error(self, "def g(): f(yield from (), 1)")
- # Not allowed at top level
- check_syntax_error(self, "yield")
- check_syntax_error(self, "yield from")
- # Not allowed at class scope
- check_syntax_error(self, "class foo:yield 1")
- check_syntax_error(self, "class foo:yield from ()")
- # Check annotation refleak on SyntaxError
- check_syntax_error(self, "def g(a:(yield)): pass")
-
- def test_yield_in_comprehensions(self):
- # Check yield in comprehensions
- def g(): [x for x in [(yield 1)]]
- def g(): [x for x in [(yield from ())]]
-
- check = self.check_syntax_error
- check("def g(): [(yield x) for x in ()]",
- "'yield' inside list comprehension")
- check("def g(): [x for x in () if not (yield x)]",
- "'yield' inside list comprehension")
- check("def g(): [y for x in () for y in [(yield x)]]",
- "'yield' inside list comprehension")
- check("def g(): {(yield x) for x in ()}",
- "'yield' inside set comprehension")
- check("def g(): {(yield x): x for x in ()}",
- "'yield' inside dict comprehension")
- check("def g(): {x: (yield x) for x in ()}",
- "'yield' inside dict comprehension")
- check("def g(): ((yield x) for x in ())",
- "'yield' inside generator expression")
- check("def g(): [(yield from x) for x in ()]",
- "'yield' inside list comprehension")
- check("class C: [(yield x) for x in ()]",
- "'yield' inside list comprehension")
- check("[(yield x) for x in ()]",
- "'yield' inside list comprehension")
-
- def test_raise(self):
- # 'raise' test [',' test]
- try: raise RuntimeError('just testing')
- except RuntimeError: pass
- try: raise KeyboardInterrupt
- except KeyboardInterrupt: pass
-
- def test_import(self):
- # 'import' dotted_as_names
- import sys
- import time, sys
- # 'from' dotted_name 'import' ('*' | '(' import_as_names ')' | import_as_names)
- from time import time
- from time import (time)
- # not testable inside a function, but already done at top of the module
- # from sys import *
- from sys import path, argv
- from sys import (path, argv)
- from sys import (path, argv,)
-
- def test_global(self):
- # 'global' NAME (',' NAME)*
- global a
- global a, b
- global one, two, three, four, five, six, seven, eight, nine, ten
-
- def test_nonlocal(self):
- # 'nonlocal' NAME (',' NAME)*
- x = 0
- y = 0
- def f():
- nonlocal x
- nonlocal x, y
-
- def test_assert(self):
- # assertTruestmt: 'assert' test [',' test]
- assert 1
- assert 1, 1
- assert lambda x: x
- assert 1, lambda x: x + 1
-
- try:
- assert True
- except AssertionError as e:
- self.fail("'assert True' should not have raised an AssertionError")
-
- try:
- assert True, 'this should always pass'
- except AssertionError as e:
- self.fail("'assert True, msg' should not have "
- "raised an AssertionError")
-
- # these tests fail if python is run with -O, so check __debug__
- @unittest.skipUnless(__debug__, "Won't work if __debug__ is False")
- def testAssert2(self):
- try:
- assert 0, "msg"
- except AssertionError as e:
- self.assertEqual(e.args[0], "msg")
- else:
- self.fail("AssertionError not raised by assert 0")
-
- try:
- assert False
- except AssertionError as e:
- self.assertEqual(len(e.args), 0)
- else:
- self.fail("AssertionError not raised by 'assert False'")
-
-
- ### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
- # Tested below
-
- def test_if(self):
- # 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
- if 1: pass
- if 1: pass
- else: pass
- if 0: pass
- elif 0: pass
- if 0: pass
- elif 0: pass
- elif 0: pass
- elif 0: pass
- else: pass
-
- def test_while(self):
- # 'while' test ':' suite ['else' ':' suite]
- while 0: pass
- while 0: pass
- else: pass
-
- # Issue1920: "while 0" is optimized away,
- # ensure that the "else" clause is still present.
- x = 0
- while 0:
- x = 1
- else:
- x = 2
- self.assertEqual(x, 2)
-
- def test_for(self):
- # 'for' exprlist 'in' exprlist ':' suite ['else' ':' suite]
- for i in 1, 2, 3: pass
- for i, j, k in (): pass
- else: pass
- class Squares:
- def __init__(self, max):
- self.max = max
- self.sofar = []
- def __len__(self): return len(self.sofar)
- def __getitem__(self, i):
- if not 0 <= i < self.max: raise IndexError
- n = len(self.sofar)
- while n <= i:
- self.sofar.append(n * n)
- n = n + 1
- return self.sofar[i]
- n = 0
- for x in Squares(10): n = n + x
- if n != 285:
- self.fail('for over growing sequence')
-
- result = []
- for x, in [(1,), (2,), (3,)]:
- result.append(x)
- self.assertEqual(result, [1, 2, 3])
-
- def test_try(self):
- ### try_stmt: 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite]
- ### | 'try' ':' suite 'finally' ':' suite
- ### except_clause: 'except' [expr ['as' expr]]
- try:
- 1 / 0
- except ZeroDivisionError:
- pass
- else:
- pass
- try: 1 / 0
- except EOFError: pass
- except TypeError as msg: pass
- except: pass
- else: pass
- try: 1 / 0
- except (EOFError, TypeError, ZeroDivisionError): pass
- try: 1 / 0
- except (EOFError, TypeError, ZeroDivisionError) as msg: pass
- try: pass
- finally: pass
-
- def test_suite(self):
- # simple_stmt | NEWLINE INDENT NEWLINE* (stmt NEWLINE*)+ DEDENT
- if 1: pass
- if 1:
- pass
- if 1:
- #
- #
- #
- pass
- pass
- #
- pass
- #
-
- def test_test(self):
- ### and_test ('or' and_test)*
- ### and_test: not_test ('and' not_test)*
- ### not_test: 'not' not_test | comparison
- if not 1: pass
- if 1 and 1: pass
- if 1 or 1: pass
- if not not not 1: pass
- if not 1 and 1 and 1: pass
- if 1 and 1 or 1 and 1 and 1 or not 1 and 1: pass
-
- def test_comparison(self):
- ### comparison: expr (comp_op expr)*
- ### comp_op: '<'|'>'|'=='|'>='|'<='|'!='|'in'|'not' 'in'|'is'|'is' 'not'
- if 1: pass
- x = (1 == 1)
- if 1 == 1: pass
- if 1 != 1: pass
- if 1 < 1: pass
- if 1 > 1: pass
- if 1 <= 1: pass
- if 1 >= 1: pass
- if 1 is 1: pass
- if 1 is not 1: pass
- if 1 in (): pass
- if 1 not in (): pass
- if 1 < 1 > 1 == 1 >= 1 <= 1 != 1 in 1 not in 1 is 1 is not 1: pass
-
- def test_binary_mask_ops(self):
- x = 1 & 1
- x = 1 ^ 1
- x = 1 | 1
-
- def test_shift_ops(self):
- x = 1 << 1
- x = 1 >> 1
- x = 1 << 1 >> 1
-
- def test_additive_ops(self):
- x = 1
- x = 1 + 1
- x = 1 - 1 - 1
- x = 1 - 1 + 1 - 1 + 1
-
- def test_multiplicative_ops(self):
- x = 1 * 1
- x = 1 / 1
- x = 1 % 1
- x = 1 / 1 * 1 % 1
-
- def test_unary_ops(self):
- x = +1
- x = -1
- x = ~1
- x = ~1 ^ 1 & 1 | 1 & 1 ^ -1
- x = -1 * 1 / 1 + 1 * 1 - -1 * 1
-
- def test_selectors(self):
- ### trailer: '(' [testlist] ')' | '[' subscript ']' | '.' NAME
- ### subscript: expr | [expr] ':' [expr]
-
- import sys, time
- c = sys.path[0]
- x = time.time()
- x = sys.modules['time'].time()
- a = '01234'
- c = a[0]
- c = a[-1]
- s = a[0:5]
- s = a[:5]
- s = a[0:]
- s = a[:]
- s = a[-5:]
- s = a[:-1]
- s = a[-4:-3]
- # A rough test of SF bug 1333982. http://python.org/sf/1333982
- # The testing here is fairly incomplete.
- # Test cases should include: commas with 1 and 2 colons
- d = {}
- d[1] = 1
- d[1,] = 2
- d[1, 2] = 3
- d[1, 2, 3] = 4
- L = list(d)
- L.sort(key=lambda x: (type(x).__name__, x))
- self.assertEqual(str(L), '[1, (1,), (1, 2), (1, 2, 3)]')
-
- def test_atoms(self):
- ### atom: '(' [testlist] ')' | '[' [testlist] ']' | '{' [dictsetmaker] '}' | NAME | NUMBER | STRING
- ### dictsetmaker: (test ':' test (',' test ':' test)* [',']) | (test (',' test)* [','])
-
- x = (1)
- x = (1 or 2 or 3)
- x = (1 or 2 or 3, 2, 3)
-
- x = []
- x = [1]
- x = [1 or 2 or 3]
- x = [1 or 2 or 3, 2, 3]
- x = []
-
- x = {}
- x = {'one': 1}
- x = {'one': 1,}
- x = {'one' or 'two': 1 or 2}
- x = {'one': 1, 'two': 2}
- x = {'one': 1, 'two': 2,}
- x = {'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6}
-
- x = {'one'}
- x = {'one', 1,}
- x = {'one', 'two', 'three'}
- x = {2, 3, 4,}
-
- x = x
- x = 'x'
- x = 123
-
- ### exprlist: expr (',' expr)* [',']
- ### testlist: test (',' test)* [',']
- # These have been exercised enough above
-
- def test_classdef(self):
- # 'class' NAME ['(' [testlist] ')'] ':' suite
- class B: pass
- class B2(): pass
- class C1(B): pass
- class C2(B): pass
- class D(C1, C2, B): pass
- class C:
- def meth1(self): pass
- def meth2(self, arg): pass
- def meth3(self, a1, a2): pass
-
- # decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
- # decorators: decorator+
- # decorated: decorators (classdef | funcdef)
- def class_decorator(x): return x
- @class_decorator
- class G: pass
-
- def test_dictcomps(self):
- # dictorsetmaker: ( (test ':' test (comp_for |
- # (',' test ':' test)* [','])) |
- # (test (comp_for | (',' test)* [','])) )
- nums = [1, 2, 3]
- self.assertEqual({i: i + 1 for i in nums}, {1: 2, 2: 3, 3: 4})
-
- def test_listcomps(self):
- # list comprehension tests
- nums = [1, 2, 3, 4, 5]
- strs = ["Apple", "Banana", "Coconut"]
- spcs = [" Apple", " Banana ", "Coco nut "]
-
- self.assertEqual([s.strip() for s in spcs], ['Apple', 'Banana', 'Coco nut'])
- self.assertEqual([3 * x for x in nums], [3, 6, 9, 12, 15])
- self.assertEqual([x for x in nums if x > 2], [3, 4, 5])
- self.assertEqual([(i, s) for i in nums for s in strs],
- [(1, 'Apple'), (1, 'Banana'), (1, 'Coconut'),
- (2, 'Apple'), (2, 'Banana'), (2, 'Coconut'),
- (3, 'Apple'), (3, 'Banana'), (3, 'Coconut'),
- (4, 'Apple'), (4, 'Banana'), (4, 'Coconut'),
- (5, 'Apple'), (5, 'Banana'), (5, 'Coconut')])
- self.assertEqual([(i, s) for i in nums for s in [f for f in strs if "n" in f]],
- [(1, 'Banana'), (1, 'Coconut'), (2, 'Banana'), (2, 'Coconut'),
- (3, 'Banana'), (3, 'Coconut'), (4, 'Banana'), (4, 'Coconut'),
- (5, 'Banana'), (5, 'Coconut')])
- self.assertEqual([(lambda a:[a ** i for i in range(a + 1)])(j) for j in range(5)],
- [[1], [1, 1], [1, 2, 4], [1, 3, 9, 27], [1, 4, 16, 64, 256]])
-
- def test_in_func(l):
- return [0 < x < 3 for x in l if x > 2]
-
- self.assertEqual(test_in_func(nums), [False, False, False])
-
- def test_nested_front():
- self.assertEqual([[y for y in [x, x + 1]] for x in [1, 3, 5]],
- [[1, 2], [3, 4], [5, 6]])
-
- test_nested_front()
-
- check_syntax_error(self, "[i, s for i in nums for s in strs]")
- check_syntax_error(self, "[x if y]")
-
- suppliers = [
- (1, "Boeing"),
- (2, "Ford"),
- (3, "Macdonalds")
- ]
-
- parts = [
- (10, "Airliner"),
- (20, "Engine"),
- (30, "Cheeseburger")
- ]
-
- suppart = [
- (1, 10), (1, 20), (2, 20), (3, 30)
- ]
-
- x = [
- (sname, pname)
- for (sno, sname) in suppliers
- for (pno, pname) in parts
- for (sp_sno, sp_pno) in suppart
- if sno == sp_sno and pno == sp_pno
- ]
-
- self.assertEqual(x, [('Boeing', 'Airliner'), ('Boeing', 'Engine'), ('Ford', 'Engine'),
- ('Macdonalds', 'Cheeseburger')])
-
- def test_genexps(self):
- # generator expression tests
- g = ([x for x in range(10)] for x in range(1))
- self.assertEqual(next(g), [x for x in range(10)])
- try:
- next(g)
- self.fail('should produce StopIteration exception')
- except StopIteration:
- pass
-
- a = 1
- try:
- g = (a for d in a)
- next(g)
- self.fail('should produce TypeError')
- except TypeError:
- pass
-
- self.assertEqual(list((x, y) for x in 'abcd' for y in 'abcd'), [(x, y) for x in 'abcd' for y in 'abcd'])
- self.assertEqual(list((x, y) for x in 'ab' for y in 'xy'), [(x, y) for x in 'ab' for y in 'xy'])
-
- a = [x for x in range(10)]
- b = (x for x in (y for y in a))
- self.assertEqual(sum(b), sum([x for x in range(10)]))
-
- self.assertEqual(sum(x ** 2 for x in range(10)), sum([x ** 2 for x in range(10)]))
- self.assertEqual(sum(x * x for x in range(10) if x % 2), sum([x * x for x in range(10) if x % 2]))
- self.assertEqual(sum(x for x in (y for y in range(10))), sum([x for x in range(10)]))
- self.assertEqual(sum(x for x in (y for y in (z for z in range(10)))), sum([x for x in range(10)]))
- self.assertEqual(sum(x for x in [y for y in (z for z in range(10))]), sum([x for x in range(10)]))
- self.assertEqual(sum(x for x in (y for y in (z for z in range(10) if True)) if True), sum([x for x in range(10)]))
- self.assertEqual(sum(x for x in (y for y in (z for z in range(10) if True) if False) if True), 0)
- check_syntax_error(self, "foo(x for x in range(10), 100)")
- check_syntax_error(self, "foo(100, x for x in range(10))")
-
- def test_comprehension_specials(self):
- # test for outmost iterable precomputation
- x = 10; g = (i for i in range(x)); x = 5
- self.assertEqual(len(list(g)), 10)
-
- # This should hold, since we're only precomputing outmost iterable.
- x = 10; t = False; g = ((i, j) for i in range(x) if t for j in range(x))
- x = 5; t = True;
- self.assertEqual([(i, j) for i in range(10) for j in range(5)], list(g))
-
- # Grammar allows multiple adjacent 'if's in listcomps and genexps,
- # even though it's silly. Make sure it works (ifelse broke this.)
- self.assertEqual([x for x in range(10) if x % 2 if x % 3], [1, 5, 7])
- self.assertEqual(list(x for x in range(10) if x % 2 if x % 3), [1, 5, 7])
-
- # verify unpacking single element tuples in listcomp/genexp.
- self.assertEqual([x for x, in [(4,), (5,), (6,)]], [4, 5, 6])
- self.assertEqual(list(x for x, in [(7,), (8,), (9,)]), [7, 8, 9])
-
- def test_with_statement(self):
- class manager(object):
- def __enter__(self):
- return (1, 2)
- def __exit__(self, *args):
- pass
-
- with manager():
- pass
- with manager() as x:
- pass
- with manager() as (x, y):
- pass
- with manager(), manager():
- pass
- with manager() as x, manager() as y:
- pass
- with manager() as x, manager():
- pass
-
- def test_if_else_expr(self):
- # Test ifelse expressions in various cases
- def _checkeval(msg, ret):
- "helper to check that evaluation of expressions is done correctly"
- print(msg)
- return ret
-
- # the next line is not allowed anymore
- #self.assertEqual([ x() for x in lambda: True, lambda: False if x() ], [True])
- self.assertEqual([x() for x in (lambda:True, lambda:False) if x()], [True])
- self.assertEqual([x(False) for x in (lambda x:False if x else True, lambda x:True if x else False) if x(False)], [True])
- self.assertEqual((5 if 1 else _checkeval("check 1", 0)), 5)
- self.assertEqual((_checkeval("check 2", 0) if 0 else 5), 5)
- self.assertEqual((5 and 6 if 0 else 1), 1)
- self.assertEqual(((5 and 6) if 0 else 1), 1)
- self.assertEqual((5 and (6 if 1 else 1)), 6)
- self.assertEqual((0 or _checkeval("check 3", 2) if 0 else 3), 3)
- self.assertEqual((1 or _checkeval("check 4", 2) if 1 else _checkeval("check 5", 3)), 1)
- self.assertEqual((0 or 5 if 1 else _checkeval("check 6", 3)), 5)
- self.assertEqual((not 5 if 1 else 1), False)
- self.assertEqual((not 5 if 0 else 1), 1)
- self.assertEqual((6 + 1 if 1 else 2), 7)
- self.assertEqual((6 - 1 if 1 else 2), 5)
- self.assertEqual((6 * 2 if 1 else 4), 12)
- self.assertEqual((6 / 2 if 1 else 3), 3)
- self.assertEqual((6 < 4 if 0 else 2), 2)
-
- def test_paren_evaluation(self):
- self.assertEqual(16 // (4 // 2), 8)
- self.assertEqual((16 // 4) // 2, 2)
- self.assertEqual(16 // 4 // 2, 2)
- self.assertTrue(False is (2 is 3))
- self.assertFalse((False is 2) is 3)
- self.assertFalse(False is 2 is 3)
-
- def test_matrix_mul(self):
- # This is not intended to be a comprehensive test, rather just to be few
- # samples of the @ operator in test_grammar.py.
- class M:
- def __matmul__(self, o):
- return 4
- def __imatmul__(self, o):
- self.other = o
- return self
- m = M()
- self.assertEqual(m @ m, 4)
- m @= 42
- self.assertEqual(m.other, 42)
-
- def test_async_await(self):
- async def test():
- def sum():
- pass
- if 1:
- await someobj()
-
- self.assertEqual(test.__name__, 'test')
- self.assertTrue(bool(test.__code__.co_flags & inspect.CO_COROUTINE))
-
- def decorator(func):
- setattr(func, '_marked', True)
- return func
-
- @decorator
- async def test2():
- return 22
- self.assertTrue(test2._marked)
- self.assertEqual(test2.__name__, 'test2')
- self.assertTrue(bool(test2.__code__.co_flags & inspect.CO_COROUTINE))
-
- def test_async_for(self):
- class Done(Exception): pass
-
- class AIter:
- def __aiter__(self):
- return self
- async def __anext__(self):
- raise StopAsyncIteration
-
- async def foo():
- async for i in AIter():
- pass
- async for i, j in AIter():
- pass
- async for i in AIter():
- pass
- else:
- pass
- raise Done
-
- with self.assertRaises(Done):
- foo().send(None)
-
- def test_async_with(self):
- class Done(Exception): pass
-
- class manager:
- async def __aenter__(self):
- return (1, 2)
- async def __aexit__(self, *exc):
- return False
-
- async def foo():
- async with manager():
- pass
- async with manager() as x:
- pass
- async with manager() as (x, y):
- pass
- async with manager(), manager():
- pass
- async with manager() as x, manager() as y:
- pass
- async with manager() as x, manager():
- pass
- raise Done
-
- with self.assertRaises(Done):
- foo().send(None)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/yapf.output b/extensions/positron-python/src/test/pythonFiles/formatting/yapf.output
deleted file mode 100644
index 43897b1753b..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/yapf.output
+++ /dev/null
@@ -1,57 +0,0 @@
---- C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py (original)
-+++ C:\GIT\issues\s p\vscode-python\src\test\pythonFiles\formatting\fileToformat.py (reformatted)
-@@ -1,22 +1,40 @@
-+import math, sys
-
--import math, sys;
-
- def example1():
- ####This is a long comment. This should be wrapped to fit within 72 characters.
-- some_tuple=( 1,2, 3,'a' );
-- some_variable={'long':'Long code lines should be wrapped within 79 characters.',
-- 'other':[math.pi, 100,200,300,9876543210,'This is a long string that goes on'],
-- 'more':{'inner':'This whole logical line should be wrapped.',some_tuple:[1,
-- 20,300,40000,500000000,60000000000000000]}}
-+ some_tuple = (1, 2, 3, 'a')
-+ some_variable = {
-+ 'long':
-+ 'Long code lines should be wrapped within 79 characters.',
-+ 'other': [
-+ math.pi, 100, 200, 300, 9876543210,
-+ 'This is a long string that goes on'
-+ ],
-+ 'more': {
-+ 'inner': 'This whole logical line should be wrapped.',
-+ some_tuple: [1, 20, 300, 40000, 500000000, 60000000000000000]
-+ }
-+ }
- return (some_tuple, some_variable)
--def example2(): return {'has_key() is deprecated':True}.has_key({'f':2}.has_key(''));
--class Example3( object ):
-- def __init__ ( self, bar ):
-- #Comments should have a space after the hash.
-- if bar : bar+=1; bar=bar* bar ; return bar
-- else:
-- some_string = """
-+
-+
-+def example2():
-+ return {
-+ 'has_key() is deprecated': True
-+ }.has_key({'f': 2}.has_key(''))
-+
-+
-+class Example3(object):
-+ def __init__(self, bar):
-+ #Comments should have a space after the hash.
-+ if bar:
-+ bar += 1
-+ bar = bar * bar
-+ return bar
-+ else:
-+ some_string = """
- Indentation in multiline strings should not be touched.
- Only actual code should be reindented.
- """
-- return (sys.path, some_string)
-+ return (sys.path, some_string)
diff --git a/extensions/positron-python/src/test/pythonFiles/formatting/yapfFormatted.py b/extensions/positron-python/src/test/pythonFiles/formatting/yapfFormatted.py
deleted file mode 100644
index aa3b079379a..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/formatting/yapfFormatted.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import math, sys
-
-
-def example1():
- ####This is a long comment. This should be wrapped to fit within 72 characters.
- some_tuple = (1, 2, 3, 'a')
- some_variable = {
- 'long':
- 'Long code lines should be wrapped within 79 characters.',
- 'other': [
- math.pi, 100, 200, 300, 9876543210,
- 'This is a long string that goes on'
- ],
- 'more': {
- 'inner': 'This whole logical line should be wrapped.',
- some_tuple: [1, 20, 300, 40000, 500000000, 60000000000000000]
- }
- }
- return (some_tuple, some_variable)
-
-
-def example2():
- return {
- 'has_key() is deprecated': True
- }.has_key({'f': 2}.has_key(''))
-
-
-class Example3(object):
- def __init__(self, bar):
- #Comments should have a space after the hash.
- if bar:
- bar += 1
- bar = bar * bar
- return bar
- else:
- some_string = """
- Indentation in multiline strings should not be touched.
-Only actual code should be reindented.
-"""
- return (sys.path, some_string)
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/cwd/.pylintrc b/extensions/positron-python/src/test/pythonFiles/linting/cwd/.pylintrc
deleted file mode 100644
index 8530187c095..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/cwd/.pylintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[MESSAGES CONTROL]
-disable=C0326,I0011,I0012,C0304,C0103,W0613,E0001,E1101
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/file.py b/extensions/positron-python/src/test/pythonFiles/linting/file.py
deleted file mode 100644
index 7b625a76924..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/file.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """this issues a message"""
- print (self)
-
- def meth2(self, arg):
- """and this one not"""
- # pylint: disable=unused-argument
- print (self\
- + "foo")
-
- def meth3(self):
- """test one line disabling"""
- # no error
- print (self.bla) # pylint: disable=no-member
- # error
- print (self.blop)
-
- def meth4(self):
- """test re-enabling"""
- # pylint: disable=no-member
- # no error
- print (self.bla)
- print (self.blop)
- # pylint: enable=no-member
- # error
- print (self.blip)
-
- def meth5(self):
- """test IF sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print (self.bla)
- if self.blop:
- # pylint: enable=no-member
- # error
- print (self.blip)
- else:
- # no error
- print (self.blip)
- # no error
- print (self.blip)
-
- def meth6(self):
- """test TRY/EXCEPT sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print (self.bla)
- try:
- # pylint: enable=no-member
- # error
- print (self.blip)
- except UndefinedName: # pylint: disable=undefined-variable
- # no error
- print (self.blip)
- # no error
- print (self.blip)
-
- def meth7(self):
- """test one line block opening disabling"""
- if self.blop: # pylint: disable=no-member
- # error
- print (self.blip)
- else:
- # error
- print (self.blip)
- # error
- print (self.blip)
-
-
- def meth8(self):
- """test late disabling"""
- # error
- print (self.blip)
- # pylint: disable=no-member
- # no error
- print (self.bla)
- print (self.blop)
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/flake8config/.flake8 b/extensions/positron-python/src/test/pythonFiles/linting/flake8config/.flake8
deleted file mode 100644
index 99ff2b9f819..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/flake8config/.flake8
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-ignore = E302,E901,E127,E261,E261,E261,E303
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/flake8config/file.py b/extensions/positron-python/src/test/pythonFiles/linting/flake8config/file.py
deleted file mode 100644
index 9abe4993ddd..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/flake8config/file.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """this issues a message"""
- print(self)
-
- def meth2(self, arg):
- """and this one not"""
- # pylint: disable=unused-argument
- print(self + "foo")
-
- def meth3(self):
- """test one line disabling"""
- # no error
- print(self.bla) # pylint: disable=no-member
- # error
- print(self.blop)
-
- def meth4(self):
- """test re-enabling"""
- # pylint: disable=no-member
- # no error
- print(self.bla)
- print(self.blop)
- # pylint: enable=no-member
- # error
- print(self.blip)
-
- def meth5(self):
- """test IF sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print(self.bla)
- if self.blop:
- # pylint: enable=no-member
- # error
- print(self.blip)
- else:
- # no error
- print(self.blip)
- # no error
- print(self.blip)
-
- def meth6(self):
- """test TRY/EXCEPT sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print(self.bla)
- try:
- # pylint: enable=no-member
- # error
- print(self.blip)
- except UndefinedName: # pylint: disable=undefined-variable
- # no error
- print(self.blip)
- # no error
- print(self.blip)
-
- def meth7(self):
- """test one line block opening disabling"""
- if self.blop: # pylint: disable=no-member
- # error
- print(self.blip)
- else:
- # error
- print(self.blip)
- # error
- print(self.blip)
-
- def meth8(self):
- """test late disabling"""
- # error
- print(self.blip)
- # pylint: disable=no-member
- # no error
- print(self.bla)
- print(self.blop)
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/minCheck.py b/extensions/positron-python/src/test/pythonFiles/linting/minCheck.py
deleted file mode 100644
index d93fa56f7e8..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/minCheck.py
+++ /dev/null
@@ -1 +0,0 @@
-filter(lambda x: x == 1, [1, 1, 2])
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/print.py b/extensions/positron-python/src/test/pythonFiles/linting/print.py
deleted file mode 100644
index fca61311fc8..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/print.py
+++ /dev/null
@@ -1 +0,0 @@
-print x
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/.pycodestyle b/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/.pycodestyle
deleted file mode 100644
index b7c78f49db8..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/.pycodestyle
+++ /dev/null
@@ -1,2 +0,0 @@
-[pycodestyle]
-ignore = E302,E901,E127,E261,E261,E261,E303
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/file.py b/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/file.py
deleted file mode 100644
index 047ba0dc679..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pycodestyleconfig/file.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """this issues a message"""
- print self
-
- def meth2(self, arg):
- """and this one not"""
- # pylint: disable=unused-argument
- print self\
- + "foo"
-
- def meth3(self):
- """test one line disabling"""
- # no error
- print self.bla # pylint: disable=no-member
- # error
- print self.blop
-
- def meth4(self):
- """test re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
- # pylint: enable=no-member
- # error
- print self.blip
-
- def meth5(self):
- """test IF sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- if self.blop:
- # pylint: enable=no-member
- # error
- print self.blip
- else:
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth6(self):
- """test TRY/EXCEPT sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- try:
- # pylint: enable=no-member
- # error
- print self.blip
- except UndefinedName: # pylint: disable=undefined-variable
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth7(self):
- """test one line block opening disabling"""
- if self.blop: # pylint: disable=no-member
- # error
- print self.blip
- else:
- # error
- print self.blip
- # error
- print self.blip
-
-
- def meth8(self):
- """test late disabling"""
- # error
- print self.blip
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/.pydocstyle b/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/.pydocstyle
deleted file mode 100644
index 19020834ad3..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/.pydocstyle
+++ /dev/null
@@ -1,2 +0,0 @@
-[pydocstyle]
-ignore=D400,D401,D402,D403,D404,D203,D102,D107
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/file.py b/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/file.py
deleted file mode 100644
index 047ba0dc679..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pydocstyleconfig27/file.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """this issues a message"""
- print self
-
- def meth2(self, arg):
- """and this one not"""
- # pylint: disable=unused-argument
- print self\
- + "foo"
-
- def meth3(self):
- """test one line disabling"""
- # no error
- print self.bla # pylint: disable=no-member
- # error
- print self.blop
-
- def meth4(self):
- """test re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
- # pylint: enable=no-member
- # error
- print self.blip
-
- def meth5(self):
- """test IF sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- if self.blop:
- # pylint: enable=no-member
- # error
- print self.blip
- else:
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth6(self):
- """test TRY/EXCEPT sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- try:
- # pylint: enable=no-member
- # error
- print self.blip
- except UndefinedName: # pylint: disable=undefined-variable
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth7(self):
- """test one line block opening disabling"""
- if self.blop: # pylint: disable=no-member
- # error
- print self.blip
- else:
- # error
- print self.blip
- # error
- print self.blip
-
-
- def meth8(self):
- """test late disabling"""
- # error
- print self.blip
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/.pylintrc b/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/.pylintrc
deleted file mode 100644
index 74ea19101f8..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/.pylintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[MESSAGES CONTROL]
-disable=I0011,C0304,C0103,W0613,E0001,E1101
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file.py b/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file.py
deleted file mode 100644
index 047ba0dc679..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """this issues a message"""
- print self
-
- def meth2(self, arg):
- """and this one not"""
- # pylint: disable=unused-argument
- print self\
- + "foo"
-
- def meth3(self):
- """test one line disabling"""
- # no error
- print self.bla # pylint: disable=no-member
- # error
- print self.blop
-
- def meth4(self):
- """test re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
- # pylint: enable=no-member
- # error
- print self.blip
-
- def meth5(self):
- """test IF sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- if self.blop:
- # pylint: enable=no-member
- # error
- print self.blip
- else:
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth6(self):
- """test TRY/EXCEPT sub-block re-enabling"""
- # pylint: disable=no-member
- # no error
- print self.bla
- try:
- # pylint: enable=no-member
- # error
- print self.blip
- except UndefinedName: # pylint: disable=undefined-variable
- # no error
- print self.blip
- # no error
- print self.blip
-
- def meth7(self):
- """test one line block opening disabling"""
- if self.blop: # pylint: disable=no-member
- # error
- print self.blip
- else:
- # error
- print self.blip
- # error
- print self.blip
-
-
- def meth8(self):
- """test late disabling"""
- # error
- print self.blip
- # pylint: disable=no-member
- # no error
- print self.bla
- print self.blop
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file2.py b/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file2.py
deleted file mode 100644
index f375c984aa2..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/pylintconfig/file2.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""pylint option block-disable"""
-
-__revision__ = None
-
-class Foo(object):
- """block-disable test"""
-
- def __init__(self):
- pass
-
- def meth1(self, arg):
- """meth1"""
- print self.blop
-
- def meth2(self, arg):
- """meth2"""
- # pylint: disable=unused-argument
- print self\
- + "foo"
diff --git a/extensions/positron-python/src/test/pythonFiles/linting/threeLineLints.py b/extensions/positron-python/src/test/pythonFiles/linting/threeLineLints.py
deleted file mode 100644
index e8b578d93f1..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/linting/threeLineLints.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""pylint messages with three lines of output"""
-
-__revision__ = None
-
-class Foo(object):
-
- def __init__(self):
- pass
-
- def meth1(self,arg):
- """missing a space between 'self' and 'arg'. This should trigger the
- following three line lint warning::
-
- C: 10, 0: Exactly one space required after comma
- def meth1(self,arg):
- ^ (bad-whitespace)
-
- The following three lines of tuples should also cause three-line lint
- errors due to "Exactly one space required after comma" messages.
- """
- a = (1,2)
- b = (1,2)
- c = (1,2)
- print (self)
diff --git a/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/config.py b/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/config.py
deleted file mode 100644
index dee2d1ae9a6..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/config.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# The default ``config.py``
-# flake8: noqa
-
-
-def set_prefs(prefs):
- """This function is called before opening the project"""
-
- # Specify which files and folders to ignore in the project.
- # Changes to ignored resources are not added to the history and
- # VCSs. Also they are not returned in `Project.get_files()`.
- # Note that ``?`` and ``*`` match all characters but slashes.
- # '*.pyc': matches 'test.pyc' and 'pkg/test.pyc'
- # 'mod*.pyc': matches 'test/mod1.pyc' but not 'mod/1.pyc'
- # '.svn': matches 'pkg/.svn' and all of its children
- # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o'
- # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o'
- prefs['ignored_resources'] = ['*.pyc', '*~', '.ropeproject',
- '.hg', '.svn', '_svn', '.git', '.tox']
-
- # Specifies which files should be considered python files. It is
- # useful when you have scripts inside your project. Only files
- # ending with ``.py`` are considered to be python files by
- # default.
- # prefs['python_files'] = ['*.py']
-
- # Custom source folders: By default rope searches the project
- # for finding source folders (folders that should be searched
- # for finding modules). You can add paths to that list. Note
- # that rope guesses project source folders correctly most of the
- # time; use this if you have any problems.
- # The folders should be relative to project root and use '/' for
- # separating folders regardless of the platform rope is running on.
- # 'src/my_source_folder' for instance.
- # prefs.add('source_folders', 'src')
-
- # You can extend python path for looking up modules
- # prefs.add('python_path', '~/python/')
-
- # Should rope save object information or not.
- prefs['save_objectdb'] = True
- prefs['compress_objectdb'] = False
-
- # If `True`, rope analyzes each module when it is being saved.
- prefs['automatic_soa'] = True
- # The depth of calls to follow in static object analysis
- prefs['soa_followed_calls'] = 0
-
- # If `False` when running modules or unit tests "dynamic object
- # analysis" is turned off. This makes them much faster.
- prefs['perform_doa'] = True
-
- # Rope can check the validity of its object DB when running.
- prefs['validate_objectdb'] = True
-
- # How many undos to hold?
- prefs['max_history_items'] = 32
-
- # Shows whether to save history across sessions.
- prefs['save_history'] = True
- prefs['compress_history'] = False
-
- # Set the number spaces used for indenting. According to
- # :PEP:`8`, it is best to use 4 spaces. Since most of rope's
- # unit-tests use 4 spaces it is more reliable, too.
- prefs['indent_size'] = 4
-
- # Builtin and c-extension modules that are allowed to be imported
- # and inspected by rope.
- prefs['extension_modules'] = []
-
- # Add all standard c-extensions to extension_modules list.
- prefs['import_dynload_stdmods'] = True
-
- # If `True` modules with syntax errors are considered to be empty.
- # The default value is `False`; When `False` syntax errors raise
- # `rope.base.exceptions.ModuleSyntaxError` exception.
- prefs['ignore_syntax_errors'] = False
-
- # If `True`, rope ignores unresolvable imports. Otherwise, they
- # appear in the importing namespace.
- prefs['ignore_bad_imports'] = False
-
- # If `True`, rope will insert new module imports as
- # `from import ` by default.
- prefs['prefer_module_from_imports'] = False
-
- # If `True`, rope will transform a comma list of imports into
- # multiple separate import statements when organizing
- # imports.
- prefs['split_imports'] = False
-
- # If `True`, rope will remove all top-level import statements and
- # reinsert them at the top of the module when making changes.
- prefs['pull_imports_to_top'] = True
-
- # If `True`, rope will sort imports alphabetically by module name instead
- # of alphabetically by import statement, with from imports after normal
- # imports.
- prefs['sort_imports_alphabetically'] = False
-
- # Location of implementation of
- # rope.base.oi.type_hinting.interfaces.ITypeHintingFactory In general
- # case, you don't have to change this value, unless you're an rope expert.
- # Change this value to inject you own implementations of interfaces
- # listed in module rope.base.oi.type_hinting.providers.interfaces
- # For example, you can add you own providers for Django Models, or disable
- # the search type-hinting in a class hierarchy, etc.
- prefs['type_hinting_factory'] = (
- 'rope.base.oi.type_hinting.factory.default_type_hinting_factory')
-
-
-def project_opened(project):
- """This function is called after opening the project"""
- # Do whatever you like here!
diff --git a/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/objectdb b/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/objectdb
deleted file mode 100644
index 0a47446c0ad..00000000000
Binary files a/extensions/positron-python/src/test/pythonFiles/refactoring/source folder/.vscode/.ropeproject/objectdb and /dev/null differ
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/after.py b/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/after.py
deleted file mode 100644
index b768c396014..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/after.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import io; sys; json
-import traceback
-
-import rope
-import rope.base.project
-import rope.base.taskhandle
-from rope.base import libutils
-from rope.refactor.extract import ExtractMethod, ExtractVariable
-from rope.refactor.rename import Rename
-
-WORKSPACE_ROOT = sys.argv[1]
-ROPE_PROJECT_FOLDER = sys.argv[2]
-
-
-def test():
- pass
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/before.py b/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/before.py
deleted file mode 100644
index fcd7318b5c0..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/before.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import io; sys; json
-import traceback
-import rope
-
-import rope.base.project
-import rope.base.taskhandle
-
-WORKSPACE_ROOT = sys.argv[1]
-ROPE_PROJECT_FOLDER = sys.argv[2]
-
-
-def test():
- pass
-
-from rope.base import libutils
-from rope.refactor.rename import Rename
-from rope.refactor.extract import ExtractMethod, ExtractVariable
-
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/original.py b/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/original.py
deleted file mode 100644
index fcd7318b5c0..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/noconfig/original.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import io; sys; json
-import traceback
-import rope
-
-import rope.base.project
-import rope.base.taskhandle
-
-WORKSPACE_ROOT = sys.argv[1]
-ROPE_PROJECT_FOLDER = sys.argv[2]
-
-
-def test():
- pass
-
-from rope.base import libutils
-from rope.refactor.rename import Rename
-from rope.refactor.extract import ExtractMethod, ExtractVariable
-
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/.isort.cfg b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/.isort.cfg
deleted file mode 100644
index 68da732e2b4..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/.isort.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[settings]
-force_single_line=True
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/after.py b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/after.py
deleted file mode 100644
index e1fd315dbf9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/after.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from third_party import (lib1, lib2, lib3,
- lib4, lib5, lib6,
- lib7, lib8, lib9)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.1.py b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.1.py
deleted file mode 100644
index e1fd315dbf9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.1.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from third_party import (lib1, lib2, lib3,
- lib4, lib5, lib6,
- lib7, lib8, lib9)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.py b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.py
deleted file mode 100644
index e1fd315dbf9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/before.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from third_party import (lib1, lib2, lib3,
- lib4, lib5, lib6,
- lib7, lib8, lib9)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.1.py b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.1.py
deleted file mode 100644
index e1fd315dbf9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.1.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from third_party import (lib1, lib2, lib3,
- lib4, lib5, lib6,
- lib7, lib8, lib9)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.py b/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.py
deleted file mode 100644
index e1fd315dbf9..00000000000
--- a/extensions/positron-python/src/test/pythonFiles/sorting/withconfig/original.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from third_party import (lib1, lib2, lib3,
- lib4, lib5, lib6,
- lib7, lib8, lib9)
\ No newline at end of file
diff --git a/extensions/positron-python/src/test/pythonFiles/datascience/simple_nb.ipynb b/extensions/positron-python/src/test/python_files/datascience/simple_nb.ipynb
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/datascience/simple_nb.ipynb
rename to extensions/positron-python/src/test/python_files/datascience/simple_nb.ipynb
diff --git a/extensions/positron-python/src/test/pythonFiles/datascience/simple_note_book.py b/extensions/positron-python/src/test/python_files/datascience/simple_note_book.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/datascience/simple_note_book.py
rename to extensions/positron-python/src/test/python_files/datascience/simple_note_book.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/forever.py b/extensions/positron-python/src/test/python_files/debugging/forever.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/forever.py
rename to extensions/positron-python/src/test/python_files/debugging/forever.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/logMessage.py b/extensions/positron-python/src/test/python_files/debugging/logMessage.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/logMessage.py
rename to extensions/positron-python/src/test/python_files/debugging/logMessage.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/loopyTest.py b/extensions/positron-python/src/test/python_files/debugging/loopyTest.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/loopyTest.py
rename to extensions/positron-python/src/test/python_files/debugging/loopyTest.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/multiThread.py b/extensions/positron-python/src/test/python_files/debugging/multiThread.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/multiThread.py
rename to extensions/positron-python/src/test/python_files/debugging/multiThread.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/printSysArgv.py b/extensions/positron-python/src/test/python_files/debugging/printSysArgv.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/printSysArgv.py
rename to extensions/positron-python/src/test/python_files/debugging/printSysArgv.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/sample2.py b/extensions/positron-python/src/test/python_files/debugging/sample2.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/sample2.py
rename to extensions/positron-python/src/test/python_files/debugging/sample2.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/sample2WithoutSleep.py b/extensions/positron-python/src/test/python_files/debugging/sample2WithoutSleep.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/sample2WithoutSleep.py
rename to extensions/positron-python/src/test/python_files/debugging/sample2WithoutSleep.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/sample3WithEx.py b/extensions/positron-python/src/test/python_files/debugging/sample3WithEx.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/sample3WithEx.py
rename to extensions/positron-python/src/test/python_files/debugging/sample3WithEx.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/sampleWithAssertEx.py b/extensions/positron-python/src/test/python_files/debugging/sampleWithAssertEx.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/sampleWithAssertEx.py
rename to extensions/positron-python/src/test/python_files/debugging/sampleWithAssertEx.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/sampleWithSleep.py b/extensions/positron-python/src/test/python_files/debugging/sampleWithSleep.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/sampleWithSleep.py
rename to extensions/positron-python/src/test/python_files/debugging/sampleWithSleep.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/simplePrint.py b/extensions/positron-python/src/test/python_files/debugging/simplePrint.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/simplePrint.py
rename to extensions/positron-python/src/test/python_files/debugging/simplePrint.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/stackFrame.py b/extensions/positron-python/src/test/python_files/debugging/stackFrame.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/stackFrame.py
rename to extensions/positron-python/src/test/python_files/debugging/stackFrame.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/startAndWait.py b/extensions/positron-python/src/test/python_files/debugging/startAndWait.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/startAndWait.py
rename to extensions/positron-python/src/test/python_files/debugging/startAndWait.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/stdErrOutput.py b/extensions/positron-python/src/test/python_files/debugging/stdErrOutput.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/stdErrOutput.py
rename to extensions/positron-python/src/test/python_files/debugging/stdErrOutput.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/stdOutOutput.py b/extensions/positron-python/src/test/python_files/debugging/stdOutOutput.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/stdOutOutput.py
rename to extensions/positron-python/src/test/python_files/debugging/stdOutOutput.py
diff --git a/extensions/positron-python/src/test/pythonFiles/debugging/wait_for_file.py b/extensions/positron-python/src/test/python_files/debugging/wait_for_file.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/debugging/wait_for_file.py
rename to extensions/positron-python/src/test/python_files/debugging/wait_for_file.py
diff --git a/extensions/positron-python/src/test/pythonFiles/dummy.py b/extensions/positron-python/src/test/python_files/dummy.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/dummy.py
rename to extensions/positron-python/src/test/python_files/dummy.py
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/Scripts/conda.exe b/extensions/positron-python/src/test/python_files/environments/conda/Scripts/conda.exe
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/Scripts/conda.exe
rename to extensions/positron-python/src/test/python_files/environments/conda/Scripts/conda.exe
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/conda/envs/scipy/python.exe b/extensions/positron-python/src/test/python_files/environments/conda/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/conda/envs/scipy/python.exe
rename to extensions/positron-python/src/test/python_files/environments/conda/bin/python
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path1/one b/extensions/positron-python/src/test/python_files/environments/conda/envs/numpy/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path1/one
rename to extensions/positron-python/src/test/python_files/environments/conda/envs/numpy/bin/python
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path1/python.exe b/extensions/positron-python/src/test/python_files/environments/conda/envs/numpy/python.exe
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path1/python.exe
rename to extensions/positron-python/src/test/python_files/environments/conda/envs/numpy/python.exe
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path1/one.exe b/extensions/positron-python/src/test/python_files/environments/conda/envs/scipy/bin/python
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path1/one.exe
rename to extensions/positron-python/src/test/python_files/environments/conda/envs/scipy/bin/python
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path2/python.exe b/extensions/positron-python/src/test/python_files/environments/conda/envs/scipy/python.exe
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path2/python.exe
rename to extensions/positron-python/src/test/python_files/environments/conda/envs/scipy/python.exe
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path2/one b/extensions/positron-python/src/test/python_files/environments/path1/one
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path2/one
rename to extensions/positron-python/src/test/python_files/environments/path1/one
diff --git a/extensions/positron-python/src/test/pythonFiles/environments/path2/one.exe b/extensions/positron-python/src/test/python_files/environments/path1/one.exe
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/environments/path2/one.exe
rename to extensions/positron-python/src/test/python_files/environments/path1/one.exe
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/noMatch.py b/extensions/positron-python/src/test/python_files/environments/path1/python.exe
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/noMatch.py
rename to extensions/positron-python/src/test/python_files/environments/path1/python.exe
diff --git a/extensions/positron-python/src/test/python_files/environments/path2/one b/extensions/positron-python/src/test/python_files/environments/path2/one
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/extensions/positron-python/src/test/python_files/environments/path2/one.exe b/extensions/positron-python/src/test/python_files/environments/path2/one.exe
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/extensions/positron-python/src/test/python_files/environments/path2/python.exe b/extensions/positron-python/src/test/python_files/environments/path2/python.exe
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/extensions/positron-python/src/test/pythonFiles/intellisense/test.py b/extensions/positron-python/src/test/python_files/intellisense/test.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/intellisense/test.py
rename to extensions/positron-python/src/test/python_files/intellisense/test.py
diff --git a/extensions/positron-python/src/test/pythonFiles/shebang/plain.py b/extensions/positron-python/src/test/python_files/shebang/plain.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/shebang/plain.py
rename to extensions/positron-python/src/test/python_files/shebang/plain.py
diff --git a/extensions/positron-python/src/test/pythonFiles/shebang/shebang.py b/extensions/positron-python/src/test/python_files/shebang/shebang.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/shebang/shebang.py
rename to extensions/positron-python/src/test/python_files/shebang/shebang.py
diff --git a/extensions/positron-python/src/test/pythonFiles/shebang/shebangEnv.py b/extensions/positron-python/src/test/python_files/shebang/shebangEnv.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/shebang/shebangEnv.py
rename to extensions/positron-python/src/test/python_files/shebang/shebangEnv.py
diff --git a/extensions/positron-python/src/test/pythonFiles/shebang/shebangInvalid.py b/extensions/positron-python/src/test/python_files/shebang/shebangInvalid.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/shebang/shebangInvalid.py
rename to extensions/positron-python/src/test/python_files/shebang/shebangInvalid.py
diff --git a/extensions/positron-python/src/test/python_files/tensorBoard/noMatch.py b/extensions/positron-python/src/test/python_files/tensorBoard/noMatch.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/sourcefile.py b/extensions/positron-python/src/test/python_files/tensorBoard/sourcefile.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/sourcefile.py
rename to extensions/positron-python/src/test/python_files/tensorBoard/sourcefile.py
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_import.ipynb b/extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_import.ipynb
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_import.ipynb
rename to extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_import.ipynb
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_imports.py b/extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_imports.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_imports.py
rename to extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_imports.py
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_launch.py b/extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_launch.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_launch.py
rename to extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_launch.py
diff --git a/extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_nbextension.ipynb b/extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_nbextension.ipynb
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/tensorBoard/tensorboard_nbextension.ipynb
rename to extensions/positron-python/src/test/python_files/tensorBoard/tensorboard_nbextension.ipynb
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample1_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample1_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample1_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample1_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample1_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample1_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample1_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample2_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample2_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample2_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample2_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample2_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample2_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample2_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample3_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample3_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample3_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample3_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample3_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample3_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample3_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample4_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample4_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample4_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample4_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample4_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample4_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample4_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample5_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample5_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample5_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample5_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample5_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample5_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample5_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample6_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample6_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample6_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample6_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample6_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample6_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample6_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample7_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample7_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample7_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample7_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample7_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample7_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample7_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample8_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample8_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample8_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample8_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample8_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample8_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample8_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample_invalid_smart_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample_invalid_smart_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample_invalid_smart_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample_invalid_smart_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample_normalized.py b/extensions/positron-python/src/test/python_files/terminalExec/sample_normalized.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample_normalized.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample_normalized.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample_normalized_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample_normalized_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample_normalized_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample_normalized_selection.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample_raw.py b/extensions/positron-python/src/test/python_files/terminalExec/sample_raw.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample_raw.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample_raw.py
diff --git a/extensions/positron-python/src/test/pythonFiles/terminalExec/sample_smart_selection.py b/extensions/positron-python/src/test/python_files/terminalExec/sample_smart_selection.py
similarity index 100%
rename from extensions/positron-python/src/test/pythonFiles/terminalExec/sample_smart_selection.py
rename to extensions/positron-python/src/test/python_files/terminalExec/sample_smart_selection.py
diff --git a/extensions/positron-python/src/test/smoke/datascience.smoke.test.ts b/extensions/positron-python/src/test/smoke/datascience.smoke.test.ts
index ebd101b5849..30298183c51 100644
--- a/extensions/positron-python/src/test/smoke/datascience.smoke.test.ts
+++ b/extensions/positron-python/src/test/smoke/datascience.smoke.test.ts
@@ -35,7 +35,7 @@ suite('Smoke Test: Datascience', () => {
EXTENSION_ROOT_DIR_FOR_TESTS,
'src',
'test',
- 'pythonFiles',
+ 'python_files',
'datascience',
'simple_note_book.py',
);
@@ -60,7 +60,7 @@ suite('Smoke Test: Datascience', () => {
EXTENSION_ROOT_DIR_FOR_TESTS,
'src',
'test',
- 'pythonFiles',
+ 'python_files',
'datascience',
'simple_nb.ipynb',
);
diff --git a/extensions/positron-python/src/test/smoke/jedilsp.smoke.test.ts b/extensions/positron-python/src/test/smoke/jedilsp.smoke.test.ts
index acde436442e..e25d2bcdd1c 100644
--- a/extensions/positron-python/src/test/smoke/jedilsp.smoke.test.ts
+++ b/extensions/positron-python/src/test/smoke/jedilsp.smoke.test.ts
@@ -24,7 +24,7 @@ suite('Smoke Test: Jedi LSP', () => {
teardown(closeActiveWindows);
test('Verify diagnostics on a python file', async () => {
- const file = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'pythonFiles', 'intellisense', 'test.py');
+ const file = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src', 'test', 'python_files', 'intellisense', 'test.py');
const outputFile = path.join(path.dirname(file), 'ds.log');
if (await fs.pathExists(outputFile)) {
await fs.unlink(outputFile);
diff --git a/extensions/positron-python/src/test/telemetry/index.unit.test.ts b/extensions/positron-python/src/test/telemetry/index.unit.test.ts
index d369dce2785..e155ac0a209 100644
--- a/extensions/positron-python/src/test/telemetry/index.unit.test.ts
+++ b/extensions/positron-python/src/test/telemetry/index.unit.test.ts
@@ -10,7 +10,6 @@ import * as fs from 'fs-extra';
import {
_resetSharedProperties,
clearTelemetryReporter,
- isTelemetryDisabled,
sendTelemetryEvent,
setSharedProperty,
} from '../../client/telemetry';
@@ -60,29 +59,6 @@ suite('Telemetry', () => {
sinon.restore();
});
- const testsForisTelemetryDisabled = [
- {
- testName: 'Returns true',
- settings: { enableTelemetry: true },
- expectedResult: false,
- },
- {
- testName: 'Returns false ',
- settings: { enableTelemetry: false },
- expectedResult: true,
- },
- ];
-
- suite('Function isTelemetryDisabled()', () => {
- testsForisTelemetryDisabled.forEach((testParams) => {
- test(testParams.testName, async () => {
- readJSONSyncStub.returns(testParams.settings);
- expect(isTelemetryDisabled()).to.equal(testParams.expectedResult);
- sinon.assert.calledOnce(readJSONSyncStub);
- });
- });
- });
-
test('Send Telemetry', () => {
rewiremock.enable();
rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
diff --git a/extensions/positron-python/src/test/tensorBoard/tensorBoardSession.test.ts b/extensions/positron-python/src/test/tensorBoard/tensorBoardSession.test.ts
index 2faaf8e3961..626740f4f53 100644
--- a/extensions/positron-python/src/test/tensorBoard/tensorBoardSession.test.ts
+++ b/extensions/positron-python/src/test/tensorBoard/tensorBoardSession.test.ts
@@ -461,7 +461,7 @@ suite('TensorBoard session creation', async () => {
EXTENSION_ROOT_DIR_FOR_TESTS,
'src',
'test',
- 'pythonFiles',
+ 'python_files',
'tensorBoard',
'sourcefile.py',
);
diff --git a/extensions/positron-python/src/test/terminals/codeExecution/helper.test.ts b/extensions/positron-python/src/test/terminals/codeExecution/helper.test.ts
index ac47037a234..2ea00e77c92 100644
--- a/extensions/positron-python/src/test/terminals/codeExecution/helper.test.ts
+++ b/extensions/positron-python/src/test/terminals/codeExecution/helper.test.ts
@@ -10,6 +10,7 @@ import { SemVer } from 'semver';
import * as TypeMoq from 'typemoq';
import { Position, Range, Selection, TextDocument, TextEditor, TextLine, Uri } from 'vscode';
import {
+ IActiveResourceService,
IApplicationShell,
ICommandManager,
IDocumentManager,
@@ -23,6 +24,7 @@ import {
IProcessServiceFactory,
ObservableExecutionResult,
} from '../../../client/common/process/types';
+import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
import { Architecture } from '../../../client/common/utils/platform';
import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
import { IInterpreterService } from '../../../client/interpreter/contracts';
@@ -32,9 +34,10 @@ import { CodeExecutionHelper } from '../../../client/terminals/codeExecution/hel
import { ICodeExecutionHelper } from '../../../client/terminals/types';
import { PYTHON_PATH } from '../../common';
-const TEST_FILES_PATH = path.join(EXTENSION_ROOT_DIR, 'src', 'test', 'pythonFiles', 'terminalExec');
+const TEST_FILES_PATH = path.join(EXTENSION_ROOT_DIR, 'src', 'test', 'python_files', 'terminalExec');
suite('Terminal - Code Execution Helper', () => {
+ let activeResourceService: TypeMoq.IMock;
let documentManager: TypeMoq.IMock;
let applicationShell: TypeMoq.IMock;
let helper: ICodeExecutionHelper;
@@ -44,6 +47,8 @@ suite('Terminal - Code Execution Helper', () => {
let interpreterService: TypeMoq.IMock;
let commandManager: TypeMoq.IMock;
let workspaceService: TypeMoq.IMock;
+ let configurationService: TypeMoq.IMock;
+ let pythonSettings: TypeMoq.IMock;
const workingPython: PythonEnvironment = {
path: PYTHON_PATH,
version: new SemVer('3.6.6-final'),
@@ -57,13 +62,16 @@ suite('Terminal - Code Execution Helper', () => {
setup(() => {
const serviceContainer = TypeMoq.Mock.ofType();
commandManager = TypeMoq.Mock.ofType();
+ configurationService = TypeMoq.Mock.ofType();
workspaceService = TypeMoq.Mock.ofType();
documentManager = TypeMoq.Mock.ofType();
applicationShell = TypeMoq.Mock.ofType();
const envVariablesProvider = TypeMoq.Mock.ofType();
processService = TypeMoq.Mock.ofType();
interpreterService = TypeMoq.Mock.ofType();
-
+ activeResourceService = TypeMoq.Mock.ofType();
+ pythonSettings = TypeMoq.Mock.ofType();
+ const resource = Uri.parse('a');
// eslint-disable-next-line @typescript-eslint/no-explicit-any
processService.setup((x: any) => x.then).returns(() => undefined);
interpreterService
@@ -95,6 +103,24 @@ suite('Terminal - Code Execution Helper', () => {
serviceContainer
.setup((c) => c.get(TypeMoq.It.isValue(IEnvironmentVariablesProvider), TypeMoq.It.isAny()))
.returns(() => envVariablesProvider.object);
+ serviceContainer
+ .setup((c) => c.get(TypeMoq.It.isValue(IConfigurationService)))
+ .returns(() => configurationService.object);
+ serviceContainer
+ .setup((c) => c.get(TypeMoq.It.isValue(IActiveResourceService)))
+ .returns(() => activeResourceService.object);
+ activeResourceService.setup((a) => a.getActiveResource()).returns(() => resource);
+ pythonSettings.setup((s) => s.REPL).returns(() => ({ enableREPLSmartSend: false, REPLSmartSend: false }));
+ configurationService.setup((x) => x.getSettings(TypeMoq.It.isAny())).returns(() => pythonSettings.object);
+ configurationService
+ .setup((c) => c.getSettings(TypeMoq.It.isAny()))
+ .returns({
+ REPL: {
+ EnableREPLSmartSend: false,
+ REPLSmartSend: false,
+ },
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } as any);
helper = new CodeExecutionHelper(serviceContainer.object);
document = TypeMoq.Mock.ofType();
@@ -118,6 +144,15 @@ suite('Terminal - Code Execution Helper', () => {
});
async function ensureCodeIsNormalized(source: string, expectedSource: string) {
+ configurationService
+ .setup((c) => c.getSettings(TypeMoq.It.isAny()))
+ .returns({
+ REPL: {
+ EnableREPLSmartSend: false,
+ REPLSmartSend: false,
+ },
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } as any);
const actualProcessService = new ProcessService();
processService
.setup((p) => p.execObservable(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()))
@@ -131,6 +166,15 @@ suite('Terminal - Code Execution Helper', () => {
['', '1', '2', '3', '4', '5', '6', '7', '8'].forEach((fileNameSuffix) => {
test(`Ensure code is normalized (Sample${fileNameSuffix})`, async () => {
+ configurationService
+ .setup((c) => c.getSettings(TypeMoq.It.isAny()))
+ .returns({
+ REPL: {
+ EnableREPLSmartSend: false,
+ REPLSmartSend: false,
+ },
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } as any);
const code = await fs.readFile(path.join(TEST_FILES_PATH, `sample${fileNameSuffix}_raw.py`), 'utf8');
const expectedCode = await fs.readFile(
path.join(TEST_FILES_PATH, `sample${fileNameSuffix}_normalized_selection.py`),
diff --git a/extensions/positron-python/src/test/terminals/codeExecution/smartSend.test.ts b/extensions/positron-python/src/test/terminals/codeExecution/smartSend.test.ts
index 4963629d0fd..f93df2ac11e 100644
--- a/extensions/positron-python/src/test/terminals/codeExecution/smartSend.test.ts
+++ b/extensions/positron-python/src/test/terminals/codeExecution/smartSend.test.ts
@@ -16,7 +16,6 @@ import { IConfigurationService, IExperimentService, IPythonSettings } from '../.
import { CodeExecutionHelper } from '../../../client/terminals/codeExecution/helper';
import { IServiceContainer } from '../../../client/ioc/types';
import { ICodeExecutionHelper } from '../../../client/terminals/types';
-import { EnableREPLSmartSend } from '../../../client/common/experiments/groups';
import { Commands, EXTENSION_ROOT_DIR } from '../../../client/common/constants';
import { EnvironmentType, PythonEnvironment } from '../../../client/pythonEnvironments/info';
import { PYTHON_PATH } from '../../common';
@@ -24,7 +23,7 @@ import { Architecture } from '../../../client/common/utils/platform';
import { ProcessService } from '../../../client/common/process/proc';
import { l10n } from '../../mocks/vsc';
-const TEST_FILES_PATH = path.join(EXTENSION_ROOT_DIR, 'src', 'test', 'pythonFiles', 'terminalExec');
+const TEST_FILES_PATH = path.join(EXTENSION_ROOT_DIR, 'src', 'test', 'python_files', 'terminalExec');
suite('REPL - Smart Send', () => {
let documentManager: TypeMoq.IMock;
@@ -117,10 +116,6 @@ suite('REPL - Smart Send', () => {
});
test('Cursor is not moved when explicit selection is present', async () => {
- experimentService
- .setup((exp) => exp.inExperimentSync(TypeMoq.It.isValue(EnableREPLSmartSend.experiment)))
- .returns(() => true);
-
const activeEditor = TypeMoq.Mock.ofType();
const firstIndexPosition = new Position(0, 0);
const selection = TypeMoq.Mock.ofType();
@@ -164,15 +159,10 @@ suite('REPL - Smart Send', () => {
});
test('Smart send should perform smart selection and move cursor', async () => {
- experimentService
- .setup((exp) => exp.inExperimentSync(TypeMoq.It.isValue(EnableREPLSmartSend.experiment)))
- .returns(() => true);
-
configurationService
.setup((c) => c.getSettings(TypeMoq.It.isAny()))
.returns({
REPL: {
- EnableREPLSmartSend: true,
REPLSmartSend: true,
},
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -228,9 +218,6 @@ suite('REPL - Smart Send', () => {
// Do not perform smart selection when there is explicit selection
test('Smart send should not perform smart selection when there is explicit selection', async () => {
- experimentService
- .setup((exp) => exp.inExperimentSync(TypeMoq.It.isValue(EnableREPLSmartSend.experiment)))
- .returns(() => true);
const activeEditor = TypeMoq.Mock.ofType();
const firstIndexPosition = new Position(0, 0);
const selection = TypeMoq.Mock.ofType();
@@ -257,15 +244,10 @@ suite('REPL - Smart Send', () => {
});
test('Smart Send should provide warning when code is not valid', async () => {
- experimentService
- .setup((exp) => exp.inExperimentSync(TypeMoq.It.isValue(EnableREPLSmartSend.experiment)))
- .returns(() => true);
-
configurationService
.setup((c) => c.getSettings(TypeMoq.It.isAny()))
.returns({
REPL: {
- EnableREPLSmartSend: true,
REPLSmartSend: true,
},
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/extensions/positron-python/src/test/testing/common/debugLauncher.unit.test.ts b/extensions/positron-python/src/test/testing/common/debugLauncher.unit.test.ts
index 1c69bac2059..ef3e678c13f 100644
--- a/extensions/positron-python/src/test/testing/common/debugLauncher.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/common/debugLauncher.unit.test.ts
@@ -151,10 +151,10 @@ suite('Unit Tests - Debug Launcher', () => {
if (!pythonTestAdapterRewriteExperiment) {
switch (testProvider) {
case 'unittest': {
- return path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'visualstudio_py_testlauncher.py');
+ return path.join(EXTENSION_ROOT_DIR, 'python_files', 'visualstudio_py_testlauncher.py');
}
case 'pytest': {
- return path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'testlauncher.py');
+ return path.join(EXTENSION_ROOT_DIR, 'python_files', 'testlauncher.py');
}
default: {
throw new Error(`Unknown test provider '${testProvider}'`);
@@ -208,14 +208,14 @@ suite('Unit Tests - Debug Launcher', () => {
if (!expected) {
expected = getDefaultDebugConfig();
}
- expected.rules = [{ path: path.join(EXTENSION_ROOT_DIR, 'pythonFiles'), include: false }];
+ expected.rules = [{ path: path.join(EXTENSION_ROOT_DIR, 'python_files'), include: false }];
expected.program = testLaunchScript;
expected.args = options.args;
if (!expected.cwd) {
expected.cwd = workspaceFolders[0].uri.fsPath;
}
- const pluginPath = path.join(EXTENSION_ROOT_DIR, 'pythonFiles');
+ const pluginPath = path.join(EXTENSION_ROOT_DIR, 'python_files');
const pythonPath = `${pluginPath}${path.delimiter}${expected.cwd}`;
expected.env.PYTHONPATH = pythonPath;
@@ -345,7 +345,7 @@ suite('Unit Tests - Debug Launcher', () => {
};
const expected = getDefaultDebugConfig();
expected.cwd = 'path/to/settings/cwd';
- const pluginPath = path.join(EXTENSION_ROOT_DIR, 'pythonFiles');
+ const pluginPath = path.join(EXTENSION_ROOT_DIR, 'python_files');
const pythonPath = `${pluginPath}${path.delimiter}${expected.cwd}`;
expected.env.PYTHONPATH = pythonPath;
diff --git a/extensions/positron-python/src/test/testing/testController/pytest/pytestDiscoveryAdapter.unit.test.ts b/extensions/positron-python/src/test/testing/testController/pytest/pytestDiscoveryAdapter.unit.test.ts
index 45f6d4ffa8e..3b1e8fec6d6 100644
--- a/extensions/positron-python/src/test/testing/testController/pytest/pytestDiscoveryAdapter.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/pytest/pytestDiscoveryAdapter.unit.test.ts
@@ -46,7 +46,7 @@ suite('pytest test discovery adapter', () => {
uuid = 'uuid123';
expectedPath = path.join('/', 'my', 'test', 'path');
uri = Uri.file(expectedPath);
- const relativePathToPytest = 'pythonFiles';
+ const relativePathToPytest = 'python_files';
const fullPluginPath = path.join(EXTENSION_ROOT_DIR, relativePathToPytest);
expectedExtraVariables = {
PYTHONPATH: fullPluginPath,
diff --git a/extensions/positron-python/src/test/testing/testController/pytest/pytestExecutionAdapter.unit.test.ts b/extensions/positron-python/src/test/testing/testController/pytest/pytestExecutionAdapter.unit.test.ts
index d2ab19368b2..26a19ed0fd0 100644
--- a/extensions/positron-python/src/test/testing/testController/pytest/pytestExecutionAdapter.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/pytest/pytestExecutionAdapter.unit.test.ts
@@ -169,7 +169,7 @@ suite('pytest test execution adapter', () => {
await deferred4.promise;
mockProc.trigger('close');
- const pathToPythonFiles = path.join(EXTENSION_ROOT_DIR, 'pythonFiles');
+ const pathToPythonFiles = path.join(EXTENSION_ROOT_DIR, 'python_files');
const pathToPythonScript = path.join(pathToPythonFiles, 'vscode_pytest', 'run_pytest_script.py');
const rootDirArg = `--rootdir=${myTestPath}`;
const expectedArgs = [pathToPythonScript, rootDirArg];
@@ -237,7 +237,7 @@ suite('pytest test execution adapter', () => {
await deferred4.promise;
mockProc.trigger('close');
- const pathToPythonFiles = path.join(EXTENSION_ROOT_DIR, 'pythonFiles');
+ const pathToPythonFiles = path.join(EXTENSION_ROOT_DIR, 'python_files');
const pathToPythonScript = path.join(pathToPythonFiles, 'vscode_pytest', 'run_pytest_script.py');
const expectedArgs = [pathToPythonScript, `--rootdir=${newCwd}`];
const expectedExtraVariables = {
diff --git a/extensions/positron-python/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts b/extensions/positron-python/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
index 0eee88120f6..c5fb0d421da 100644
--- a/extensions/positron-python/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts
@@ -42,7 +42,7 @@ suite('Unittest test discovery adapter', () => {
} as unknown) as ITestServer;
const uri = Uri.file('/foo/bar');
- const script = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
+ const script = path.join(EXTENSION_ROOT_DIR, 'python_files', 'unittestadapter', 'discovery.py');
const adapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings, outputChannel.object);
adapter.discoverTests(uri);
@@ -78,7 +78,7 @@ suite('Unittest test discovery adapter', () => {
const uri = Uri.file('/foo/bar');
const newCwd = '/foo';
- const script = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'discovery.py');
+ const script = path.join(EXTENSION_ROOT_DIR, 'python_files', 'unittestadapter', 'discovery.py');
const adapter = new UnittestTestDiscoveryAdapter(stubTestServer, stubConfigSettings, outputChannel.object);
adapter.discoverTests(uri);
diff --git a/extensions/positron-python/src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts b/extensions/positron-python/src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts
index e2903d353bb..bb82f49b477 100644
--- a/extensions/positron-python/src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts
@@ -50,7 +50,7 @@ suite('Unittest test execution adapter', () => {
} as unknown) as ITestServer;
const uri = Uri.file('/foo/bar');
- const script = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'execution.py');
+ const script = path.join(EXTENSION_ROOT_DIR, 'python_files', 'unittestadapter', 'execution.py');
const adapter = new UnittestTestExecutionAdapter(stubTestServer, stubConfigSettings, outputChannel.object);
const testIds = ['test1id', 'test2id'];
@@ -94,7 +94,7 @@ suite('Unittest test execution adapter', () => {
const newCwd = '/foo';
const uri = Uri.file('/foo/bar');
- const script = path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'unittestadapter', 'execution.py');
+ const script = path.join(EXTENSION_ROOT_DIR, 'python_files', 'unittestadapter', 'execution.py');
const adapter = new UnittestTestExecutionAdapter(stubTestServer, stubConfigSettings, outputChannel.object);
const testIds = ['test1id', 'test2id'];
diff --git a/extensions/positron-python/src/test/testing/testController/utils.unit.test.ts b/extensions/positron-python/src/test/testing/testController/utils.unit.test.ts
index 5bcf8dfa10c..36ee42ab022 100644
--- a/extensions/positron-python/src/test/testing/testController/utils.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/utils.unit.test.ts
@@ -165,10 +165,10 @@ ${data}${secondPayload}`;
suite('Test Controller Utils: Args Mapping', () => {
test('Converts map with mixed values to array of strings', async () => {
const inputMap = {
- key1: 'value1',
+ key1: ['value1'],
key2: null,
key3: undefined,
- key4: 'value4',
+ key4: ['value4'],
};
const expectedOutput = ['key1=value1', 'key2', 'key4=value4'];
@@ -209,6 +209,17 @@ ${data}${secondPayload}`;
assert.deepStrictEqual(result, expectedOutput);
});
+ test('Handles mapToArgs for a key with multiple values', async () => {
+ const inputMap = {
+ key1: null,
+ key2: ['value1', 'value2'],
+ };
+ const expectedOutput = ['key1', 'key2=value1', 'key2=value2'];
+
+ const result = mapToArgs(inputMap);
+
+ assert.deepStrictEqual(result, expectedOutput);
+ });
test('Adds new argument if it does not exist', () => {
const map = {};
const argKey = 'newKey';
@@ -216,17 +227,17 @@ ${data}${secondPayload}`;
const updatedMap = addArgIfNotExist(map, argKey, argValue);
- assert.deepStrictEqual(updatedMap, { [argKey]: argValue });
+ assert.deepStrictEqual(updatedMap, { [argKey]: [argValue] });
});
test('Does not overwrite existing argument', () => {
- const map = { existingKey: 'existingValue' };
+ const map = { existingKey: ['existingValue'] };
const argKey = 'existingKey';
const argValue = 'newValue';
const updatedMap = addArgIfNotExist(map, argKey, argValue);
- assert.deepStrictEqual(updatedMap, { [argKey]: 'existingValue' });
+ assert.deepStrictEqual(updatedMap, { [argKey]: ['existingValue'] });
});
test('Handles null value for new key', () => {
@@ -249,21 +260,9 @@ ${data}${secondPayload}`;
assert.deepStrictEqual(updatedMap, { [argKey]: null });
});
- test('Accepts addition if key exists with undefined value', () => {
- const map = { undefinedKey: undefined };
- const argKey = 'undefinedKey';
- const argValue = 'newValue';
-
- // Attempting to add a key that is explicitly set to undefined
- const updatedMap = addArgIfNotExist(map, argKey, argValue);
-
- // Expect the map to remain unchanged because the key exists as undefined
- assert.strictEqual(map[argKey], argValue);
- assert.deepStrictEqual(updatedMap, { [argKey]: argValue });
- });
test('Complex test for argKeyExists with various key types', () => {
const map = {
- stringKey: 'stringValue',
+ stringKey: ['stringValue'],
nullKey: null,
// Note: not adding an 'undefinedKey' explicitly since it's not present and hence undefined by default
};
@@ -289,7 +288,15 @@ ${data}${secondPayload}`;
});
test('Converts array of strings with "=" into a map', () => {
const args = ['key1=value1', 'key2=value2'];
- const expectedMap = { key1: 'value1', key2: 'value2' };
+ const expectedMap = { key1: ['value1'], key2: ['value2'] };
+
+ const resultMap = argsToMap(args);
+
+ assert.deepStrictEqual(resultMap, expectedMap);
+ });
+ test('Handles argsToMap for multiple values for the same key', () => {
+ const args = ['key1=value1', 'key1=value2'];
+ const expectedMap = { key1: ['value1', 'value2'] };
const resultMap = argsToMap(args);
@@ -307,7 +314,7 @@ ${data}${secondPayload}`;
test('Handles mixed keys with and without "="', () => {
const args = ['key1=value1', 'key2'];
- const expectedMap = { key1: 'value1', key2: null };
+ const expectedMap = { key1: ['value1'], key2: null };
const resultMap = argsToMap(args);
@@ -316,7 +323,7 @@ ${data}${secondPayload}`;
test('Handles strings with multiple "=" characters', () => {
const args = ['key1=part1=part2'];
- const expectedMap = { key1: 'part1=part2' };
+ const expectedMap = { key1: ['part1=part2'] };
const resultMap = argsToMap(args);
diff --git a/extensions/positron-python/yarn.lock b/extensions/positron-python/yarn.lock
index 2ed9da0a683..7e55714f025 100644
--- a/extensions/positron-python/yarn.lock
+++ b/extensions/positron-python/yarn.lock
@@ -6276,13 +6276,20 @@ minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
dependencies:
brace-expansion "^1.1.7"
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.0.1:
version "5.1.6"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
dependencies:
brace-expansion "^2.0.1"
+minimatch@^9.0.3:
+ version "9.0.4"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+ integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+ dependencies:
+ brace-expansion "^2.0.1"
+
minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6:
version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
@@ -7857,7 +7864,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.7, semver@^7.5.1, semver@^7.5.2, semver@^7.5.3:
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.5.1, semver@^7.5.2, semver@^7.5.3:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -7871,6 +7878,13 @@ semver@^7.3.5:
dependencies:
lru-cache "^6.0.0"
+semver@^7.6.0:
+ version "7.6.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+ integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+ dependencies:
+ lru-cache "^6.0.0"
+
serialize-javascript@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
@@ -9144,10 +9158,19 @@ vscode-jsonrpc@8.1.0-next.7:
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.7.tgz#4ecfada9866f677da9a5915abfceb7b7c90962f6"
integrity sha512-UJlY2e4wnI+GkaNYM2TERqrNvTe0XScny7lUA4f+F+z6XI5pDJnHj6udXiGJofT/tX57d8C6fnlfgrCfF6aptQ==
-vscode-jsonrpc@8.2.0, vscode-jsonrpc@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz#f43dfa35fb51e763d17cd94dcca0c9458f35abf9"
- integrity sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==
+vscode-jsonrpc@9.0.0-next.2, vscode-jsonrpc@^9.0.0-next.2:
+ version "9.0.0-next.2"
+ resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.2.tgz#29e9741c742c80329bba1c60ce38fd014651ba80"
+ integrity sha512-meIaXAgChCHzWy45QGU8YpCNyqnZQ/sYeCj32OLDDbUYsCF7AvgpdXx3nnZn9yzr8ed0Od9bW+NGphEmXsqvIQ==
+
+vscode-languageclient@^10.0.0-next.2:
+ version "10.0.0-next.3"
+ resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.3.tgz#d7336bafafb37569ac1d8e931d20ba2a6385cc64"
+ integrity sha512-jJhPdZaiELpPRnCUt8kQcF2HJuvzLgeW4HOGc6dp8Je+p08ndueVT4fpSsbly6KiEHr/Ri73tNz0CSfsOye6MA==
+ dependencies:
+ minimatch "^9.0.3"
+ semver "^7.6.0"
+ vscode-languageserver-protocol "3.17.6-next.4"
vscode-languageclient@^8.0.2-next.4:
version "8.0.2"
@@ -9158,15 +9181,6 @@ vscode-languageclient@^8.0.2-next.4:
semver "^7.3.5"
vscode-languageserver-protocol "3.17.2"
-vscode-languageclient@^9.0.1:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz#cdfe20267726c8d4db839dc1e9d1816e1296e854"
- integrity sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==
- dependencies:
- minimatch "^5.1.0"
- semver "^7.3.7"
- vscode-languageserver-protocol "3.17.5"
-
vscode-languageserver-protocol@3.17.2, vscode-languageserver-protocol@^3.17.2-next.5:
version "3.17.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378"
@@ -9175,13 +9189,13 @@ vscode-languageserver-protocol@3.17.2, vscode-languageserver-protocol@^3.17.2-ne
vscode-jsonrpc "8.0.2"
vscode-languageserver-types "3.17.2"
-vscode-languageserver-protocol@3.17.5, vscode-languageserver-protocol@^3.17.5:
- version "3.17.5"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz#864a8b8f390835572f4e13bd9f8313d0e3ac4bea"
- integrity sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==
+vscode-languageserver-protocol@3.17.6-next.4, vscode-languageserver-protocol@^3.17.6-next.3:
+ version "3.17.6-next.4"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.4.tgz#3c56f6eb588bb42fccc0ac54a0d5daf2d02f0a1b"
+ integrity sha512-/2bleKBxZLyRObS4mkpaWlVI9xGiUqMVmh/ztZ2vL4uP2XyIpraT45JBpn9AtXr0alqKJPKLuKr+/qcYULvm/w==
dependencies:
- vscode-jsonrpc "8.2.0"
- vscode-languageserver-types "3.17.5"
+ vscode-jsonrpc "9.0.0-next.2"
+ vscode-languageserver-types "3.17.6-next.3"
vscode-languageserver-protocol@^3.17.3-next.1:
version "3.17.3-next.6"
@@ -9201,10 +9215,10 @@ vscode-languageserver-types@3.17.3-next.3:
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3-next.3.tgz#fc909d37d4200126d74583f2114e53ace27a3e04"
integrity sha512-R36Wi5sHoVc/PsAva0QGoEgw+LRCXPDKcdjFfgoVwrRdrFOdYUkvp5G4NvrPUsVT2f2qS/bSs6QiRxyjNkcR9A==
-vscode-languageserver-types@3.17.5:
- version "3.17.5"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
- integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
+vscode-languageserver-types@3.17.6-next.3:
+ version "3.17.6-next.3"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.3.tgz#f71d6c57f18d921346cfe0c227aabd72eb8cd2f0"
+ integrity sha512-l5kNFXFRQGuzriXpuBqFpRmkf6f6A4VoU3h95OsVkqIOoi1k7KbwSo600cIdsKSJWrPg/+vX+QMPcMw1oI7ItA==
vscode-tas-client@^0.1.84:
version "0.1.84"
diff --git a/positron/comms/generate-comms.ts b/positron/comms/generate-comms.ts
index c98530a95d0..28f2c5e698f 100644
--- a/positron/comms/generate-comms.ts
+++ b/positron/comms/generate-comms.ts
@@ -45,7 +45,7 @@ const tsOutputDir = `${__dirname}/../../src/vs/workbench/services/languageRuntim
const rustOutputDir = `${__dirname}/../../../amalthea/crates/amalthea/src/comm`;
/// The directory to write the generated Python files to
-const pythonOutputDir = `${__dirname}/../../extensions/positron-python/pythonFiles/positron/positron_ipykernel`;
+const pythonOutputDir = `${__dirname}/../../extensions/positron-python/python_files/positron/positron_ipykernel`;
const year = new Date().getFullYear();