-
Notifications
You must be signed in to change notification settings - Fork 313
/
Copy pathremoteKernelControllerWatcher.unit.test.ts
350 lines (326 loc) · 15.6 KB
/
remoteKernelControllerWatcher.unit.test.ts
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
import * as fakeTimers from '@sinonjs/fake-timers';
import { assert } from 'chai';
import { anything, deepEqual, instance, mock, verify, when } from 'ts-mockito';
import { Disposable, EventEmitter } from 'vscode';
import { generateIdFromRemoteProvider } from '../../kernels/jupyter/jupyterUtils';
import {
IJupyterServerUriStorage,
IJupyterServerProviderRegistry,
JupyterServerProviderHandle
} from '../../kernels/jupyter/types';
import {
IJupyterKernelSpec,
LiveKernelModel,
LiveRemoteKernelConnectionMetadata,
LocalKernelSpecConnectionMetadata,
RemoteKernelConnectionMetadata,
RemoteKernelSpecConnectionMetadata
} from '../../kernels/types';
import { RemoteKernelControllerWatcher } from './remoteKernelControllerWatcher';
import { IControllerRegistration, IVSCodeNotebookController } from './types';
import { dispose } from '../../platform/common/utils/lifecycle';
import { IDisposable } from '../../platform/common/types';
import { JupyterServer, JupyterServerCollection, JupyterServerProvider } from '../../api';
import { noop } from '../../test/core';
suite('RemoteKernelControllerWatcher', () => {
let watcher: RemoteKernelControllerWatcher;
let disposables: IDisposable[] = [];
let uriStorage: IJupyterServerUriStorage;
let controllers: IControllerRegistration;
let onDidChangeProviders: EventEmitter<void>;
let jupyterServerProviderRegistry: IJupyterServerProviderRegistry;
let onDidChangeJupyterServerCollections: EventEmitter<{
added: JupyterServerCollection[];
removed: JupyterServerCollection[];
}>;
let clock: fakeTimers.InstalledClock;
setup(() => {
uriStorage = mock<IJupyterServerUriStorage>();
controllers = mock<IControllerRegistration>();
jupyterServerProviderRegistry = mock<IJupyterServerProviderRegistry>();
onDidChangeProviders = new EventEmitter<void>();
disposables.push(onDidChangeProviders);
onDidChangeJupyterServerCollections = new EventEmitter<{
added: JupyterServerCollection[];
removed: JupyterServerCollection[];
}>();
disposables.push(onDidChangeJupyterServerCollections);
when(jupyterServerProviderRegistry.onDidChangeCollections).thenReturn(
onDidChangeJupyterServerCollections.event
);
when(jupyterServerProviderRegistry.jupyterCollections).thenReturn([]);
when(uriStorage.remove(anything())).thenResolve();
watcher = new RemoteKernelControllerWatcher(
disposables,
instance(uriStorage),
instance(controllers),
instance(jupyterServerProviderRegistry)
);
clock = fakeTimers.install();
disposables.push(new Disposable(() => clock.uninstall()));
});
teardown(() => {
disposables = dispose(disposables);
});
test('Dispose controllers associated with an old handle', async () => {
const provider1Id = 'provider1';
const provider1Handle1: string = 'provider1Handle1';
const serverProviderHandle = { handle: provider1Handle1, id: provider1Id, extensionId: '1' };
const remoteUriForProvider1 = generateIdFromRemoteProvider(serverProviderHandle);
const collection1 = mock<JupyterServerCollection>();
when(collection1.id).thenReturn(provider1Id);
when(collection1.extensionId).thenReturn('1');
const server1 = mock<JupyterServer>();
when(server1.id).thenReturn(provider1Handle1);
const serverProvider1DidChange1 = new EventEmitter<void>();
disposables.push(serverProvider1DidChange1);
const serverProvider1 = mock<JupyterServerProvider>();
when(serverProvider1.provideJupyterServers(anything())).thenResolve([instance(server1)] as any);
when(serverProvider1.onDidChangeServers).thenReturn(serverProvider1DidChange1.event);
when(collection1.serverProvider).thenReturn(instance(serverProvider1));
const collection2 = mock<JupyterServerCollection>();
when(collection2.id).thenReturn('provider2');
const serverProvider2 = mock<JupyterServerProvider>();
when(serverProvider2.provideJupyterServers(anything())).thenResolve([] as any);
when(collection2.serverProvider).thenReturn(instance(serverProvider2));
const serverProvider1DidChange2 = new EventEmitter<void>();
disposables.push(serverProvider1DidChange2);
when(serverProvider2.onDidChangeServers).thenReturn(serverProvider1DidChange2.event);
const collection3 = mock<JupyterServerCollection>();
when(collection3.id).thenReturn('provider3');
const server3 = mock<JupyterServer>();
when(server3.id).thenReturn('provider3Handle1');
const serverProvider3 = mock<JupyterServerProvider>();
when(serverProvider3.provideJupyterServers(anything())).thenResolve([instance(server3)] as any);
when(collection3.serverProvider).thenReturn(instance(serverProvider3));
const serverProvider1DidChange3 = new EventEmitter<void>();
disposables.push(serverProvider1DidChange3);
when(serverProvider2.onDidChangeServers).thenReturn(serverProvider1DidChange3.event);
when(jupyterServerProviderRegistry.jupyterCollections).thenReturn([
instance(collection1),
instance(collection2),
instance(collection3)
]);
const localKernel = createControllerForLocalKernelSpec('local1');
const remoteKernelSpec = createControllerForRemoteKernelSpec(
'remote1',
remoteUriForProvider1,
serverProviderHandle
);
const remoteLiveKernel = createControllerForRemoteLiveKernel(
'live1',
remoteUriForProvider1,
serverProviderHandle
);
when(controllers.registered).thenReturn([
instance(localKernel),
instance(remoteKernelSpec),
instance(remoteLiveKernel)
]);
when(uriStorage.all).thenReturn([
{
time: 1,
displayName: 'Something',
provider: {
handle: provider1Handle1,
id: provider1Id,
extensionId: '1'
}
}
]);
when(uriStorage.add(anything())).thenResolve();
when(uriStorage.add(anything(), anything())).thenResolve();
// const serversChanged = createEventHandler(instance(serverProvider1), 'onDidChangeServers');
watcher.activate();
await clock.runAllAsync().catch(noop);
// 1. Verify that none of the controllers were disposed.
verify(localKernel.dispose()).never();
verify(remoteKernelSpec.dispose()).never();
verify(remoteLiveKernel.dispose()).never();
// 2. When a provider triggers a change in its handles and we're not using its handles, then none of the controllers should get disposed.
when(serverProvider1.provideJupyterServers(anything())).thenResolve([instance(server1)] as any);
serverProvider1DidChange1.fire();
await clock.runAllAsync();
verify(localKernel.dispose()).never();
verify(remoteKernelSpec.dispose()).never();
verify(remoteLiveKernel.dispose()).never();
// 3. When we trigger a change in the handles, but the same handles are still returned, then
// Verify that none of the controllers were disposed.
when(serverProvider1.provideJupyterServers(anything())).thenResolve([instance(server1)] as any);
serverProvider1DidChange1.fire!();
await clock.runAllAsync();
verify(uriStorage.remove(anything())).never();
verify(localKernel.dispose()).never();
verify(remoteKernelSpec.dispose()).never();
verify(remoteLiveKernel.dispose()).never();
// 4. When we trigger a change in the handles, & different handles are returned, then
// Verify that the old controllers have been disposed.
const server1A = mock<JupyterServer>();
when(server1A.id).thenReturn('somethingElse');
when(serverProvider1.provideJupyterServers(anything())).thenResolve([instance(server1A)] as any);
serverProvider1DidChange1.fire!();
await clock.runAllAsync();
verify(uriStorage.remove(deepEqual(serverProviderHandle))).once();
verify(localKernel.dispose()).never();
verify(remoteKernelSpec.dispose()).once();
verify(remoteLiveKernel.dispose()).once();
});
function createControllerForLocalKernelSpec(id: string) {
const localKernel = mock<IVSCodeNotebookController>();
when(localKernel.dispose()).thenReturn();
when(localKernel.connection).thenReturn(
LocalKernelSpecConnectionMetadata.create({
id,
kernelSpec: mock<IJupyterKernelSpec>()
})
);
return localKernel;
}
function createControllerForRemoteKernelSpec(
id: string,
baseUrl: string,
serverProviderHandle: JupyterServerProviderHandle
) {
const remoteKernelSpec = mock<IVSCodeNotebookController>();
when(remoteKernelSpec.id).thenReturn(id);
when(remoteKernelSpec.dispose()).thenReturn();
when(remoteKernelSpec.connection).thenReturn(
RemoteKernelSpecConnectionMetadata.create({
id,
baseUrl,
kernelSpec: mock<IJupyterKernelSpec>(),
serverProviderHandle
})
);
return remoteKernelSpec;
}
function createControllerForRemoteLiveKernel(
id: string,
baseUrl: string,
serverProviderHandle: JupyterServerProviderHandle
) {
const remoteLiveKernel = mock<IVSCodeNotebookController>();
when(remoteLiveKernel.dispose()).thenReturn();
when(remoteLiveKernel.connection).thenReturn(
LiveRemoteKernelConnectionMetadata.create({
id,
baseUrl,
kernelModel: mock<LiveKernelModel>(),
serverProviderHandle
})
);
return remoteLiveKernel;
}
test('Dispose controllers associated with an Jupyter Collection', async () => {
const localKernel = createControllerForLocalKernelSpec('local1');
const remoteKernelSpecExt1Coll1Server1 = createControllerForRemoteKernelSpec('remote1', 'http://server1:8888', {
extensionId: '1',
id: '1',
handle: '1'
});
const remoteKernelSpecExt1Coll1Server2 = createControllerForRemoteKernelSpec('remote2', 'http://server1:8888', {
extensionId: '1',
id: '1',
handle: '2'
});
const remoteLiveKernelExt1Coll1Server1 = createControllerForRemoteLiveKernel('live1', 'http://server1:8888', {
extensionId: '1',
id: '1',
handle: '2'
});
const remoteKernelSpecExt1Col2Server1 = createControllerForRemoteKernelSpec('remote2', 'http://server2:8888', {
extensionId: '1',
id: '2',
handle: '1'
});
const remoteLiveKernelExt1Col2Server1 = createControllerForRemoteLiveKernel('live2', 'http://server2:8888', {
extensionId: '1',
id: '2',
handle: '1'
});
const remoteKernelSpecExt2Col1Server1 = createControllerForRemoteKernelSpec('remote2', 'http://another:8888', {
extensionId: '2',
id: '1',
handle: '1'
});
const remoteKernelSpecExt2Col2Server1 = createControllerForRemoteLiveKernel('live2', 'http://another:8888', {
extensionId: '2',
id: '2',
handle: '1'
});
const remoteControllers: IVSCodeNotebookController[] = [
instance(remoteKernelSpecExt1Coll1Server1),
instance(remoteKernelSpecExt1Coll1Server2),
instance(remoteLiveKernelExt1Coll1Server1),
instance(remoteKernelSpecExt1Col2Server1),
instance(remoteLiveKernelExt1Col2Server1),
instance(remoteKernelSpecExt2Col1Server1),
instance(remoteKernelSpecExt2Col2Server1)
];
const remoteProviderHandles = remoteControllers
.map((k) => k.connection as RemoteKernelConnectionMetadata)
.map((c) => c.serverProviderHandle);
when(controllers.registered).thenReturn([instance(localKernel), ...remoteControllers]);
when(uriStorage.all).thenReturn(
remoteProviderHandles.map((s) => ({
time: 1,
displayName: `Server ${s.handle} Collection ${s.id} for Ext ${s.extensionId}`,
provider: s
}))
);
when(uriStorage.add(anything())).thenResolve();
when(uriStorage.add(anything(), anything())).thenResolve();
const validServersInCollection1OfExt1 = Array.from(
new Set(remoteProviderHandles.filter((s) => s.extensionId === '1' && s.id === '1').map((s) => s.handle))
).map((s) => ({ id: s, label: s }));
const onDidChangeServers = new EventEmitter<void>();
const onDidChangeProviders = new EventEmitter<void>();
const collection1OfExt1: JupyterServerCollection = {
extensionId: '1',
id: '1',
label: '1',
dispose: noop,
onDidChangeProvider: onDidChangeProviders.event,
serverProvider: {
onDidChangeServers: onDidChangeServers.event,
provideJupyterServers: async () => validServersInCollection1OfExt1,
resolveJupyterServer: () => Promise.reject(new Error('Not Supported'))
}
};
when(jupyterServerProviderRegistry.jupyterCollections).thenReturn([collection1OfExt1]);
watcher.activate();
await clock.runAllAsync();
// We know initially there are only 2 servers for the first collection in extension 1
assert.deepEqual(validServersInCollection1OfExt1, [
{ id: '1', label: '1' },
{ id: '2', label: '2' }
]);
// Verify no controllers were disposed.
verify(remoteKernelSpecExt1Coll1Server1.dispose()).never();
verify(remoteKernelSpecExt1Coll1Server2.dispose()).never();
verify(remoteKernelSpecExt2Col1Server1.dispose()).never();
verify(remoteKernelSpecExt2Col2Server1.dispose()).never();
verify(uriStorage.remove(anything())).never();
// 1. Now remove the first server and trigger a change.
validServersInCollection1OfExt1.splice(0, 1);
onDidChangeServers.fire();
await clock.runAllAsync();
// Verify we removed the right controllers
verify(remoteKernelSpecExt1Coll1Server1.dispose()).once();
verify(remoteKernelSpecExt1Coll1Server2.dispose()).never();
verify(uriStorage.remove(deepEqual({ extensionId: '1', id: '1', handle: '1' }))).once();
verify(uriStorage.remove(deepEqual({ extensionId: '1', id: '1', handle: '2' }))).never();
// 2. Dispose the collection 1 and verify the remaining servers were disposed.
onDidChangeJupyterServerCollections.fire({ added: [], removed: [collection1OfExt1] });
await clock.runAllAsync();
// Verify we removed the right controllers
verify(remoteKernelSpecExt1Coll1Server2.dispose()).once();
verify(remoteKernelSpecExt2Col1Server1.dispose()).never();
verify(remoteKernelSpecExt2Col2Server1.dispose()).never();
verify(uriStorage.remove(deepEqual({ extensionId: '1', id: '1', handle: '1' }))).once();
// Just because the collection was removed, do not remove the MRU, possible the server is still valid.
verify(uriStorage.remove(deepEqual({ extensionId: '1', id: '1', handle: '2' }))).never();
});
});