Skip to content

Commit c5342a3

Browse files
authored
Merge branch 'main' into tk/fix-project-notebook-picker
2 parents 6d05f22 + e5e2285 commit c5342a3

10 files changed

Lines changed: 361 additions & 1014 deletions

package-lock.json

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,6 +2676,7 @@
26762676
"@deepnote/blocks": "^4.3.0",
26772677
"@deepnote/convert": "^3.2.0",
26782678
"@deepnote/database-integrations": "^1.4.3",
2679+
"@deepnote/runtime-core": "^0.2.0",
26792680
"@deepnote/sql-language-server": "^3.0.0",
26802681
"@enonic/fnv-plus": "^1.3.0",
26812682
"@jupyter-widgets/base": "^6.0.8",

src/kernels/deepnote/deepnoteLspClientManager.node.vscode.test.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { assert } from 'chai';
22
import { Uri } from 'vscode';
33

44
import { DeepnoteLspClientManager } from './deepnoteLspClientManager.node';
5+
import { createMockChildProcess } from './deepnoteTestHelpers.node';
56
import { IDisposableRegistry } from '../../platform/common/types';
67
import { PythonEnvironment } from '../../platform/pythonEnvironments/info';
78
import * as path from '../../platform/vscode-path/path';
@@ -84,7 +85,8 @@ suite('DeepnoteLspClientManager Integration Tests', () => {
8485
url: 'http://localhost:8888',
8586
jupyterPort: 8888,
8687
lspPort: 8889,
87-
token: 'test-token'
88+
token: 'test-token',
89+
process: createMockChildProcess()
8890
};
8991

9092
// This will attempt to start LSP clients but may fail if pylsp isn't installed
@@ -135,7 +137,8 @@ suite('DeepnoteLspClientManager Integration Tests', () => {
135137
url: 'http://localhost:8888',
136138
jupyterPort: 8888,
137139
lspPort: 8889,
138-
token: 'test-token'
140+
token: 'test-token',
141+
process: createMockChildProcess()
139142
};
140143

141144
try {
@@ -166,7 +169,8 @@ suite('DeepnoteLspClientManager Integration Tests', () => {
166169
url: 'http://localhost:8888',
167170
jupyterPort: 8888,
168171
lspPort: 8889,
169-
token: 'test-token'
172+
token: 'test-token',
173+
process: createMockChildProcess()
170174
};
171175

172176
try {

0 commit comments

Comments
 (0)