feedback

Author: Artmann

src/kernels/kernelAutoReConnectMonitor.unit.test.ts

@@ -349,6 +349,7 @@ suite('Kernel ReConnect Failed Monitor', () => {
 
         // Send the kernel into connecting state & then disconnected.
         kernel.kernelConnectionStatusSignal.emit('connecting');
+        await clock.nextAsync();
         kernel.kernelConnectionStatusSignal.emit('disconnected');
         await clock.nextAsync();
 

src/kernels/raw/session/rawSessionConnection.node.ts

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import type { Kernel, KernelMessage, ServerConnection, Session } from '@jupyterlab/services';
+import { type Kernel, type KernelMessage, ServerConnection, type Session } from '@jupyterlab/services';
 import { Signal } from '@lumino/signaling';
-import { createRequire } from 'module';
 
 import { logger } from '../../../platform/logging';
 import { Resource } from '../../../platform/common/types';
@@ -18,8 +17,6 @@ import { trackKernelResourceInformation } from '../../telemetry/helper';
 import { RawKernelConnection } from './rawKernelConnection.node';
 import { generateUuid } from '../../../platform/common/uuid';
 
-const require = createRequire(import.meta.url);
-
 /*
 RawSession class implements a jupyterlab ISession object
 This provides enough of the ISession interface so that our direct
@@ -49,8 +46,7 @@ export class RawSessionConnection implements Session.ISessionConnection {
     }
     get serverSettings(): ServerConnection.ISettings {
         // We do not expect anyone to use this. Hence return a setting thats now expected to work, but at least compiles.
-        const jupyterLab = require('@jupyterlab/services') as typeof import('@jupyterlab/services'); // NOSONAR
-        return jupyterLab.ServerConnection.makeSettings({
+        return ServerConnection.makeSettings({
             wsUrl: 'RAW'
         });
     }

src/platform/common/platform/fileUtils.node.ts

@@ -31,10 +31,14 @@ function pathExistsImpl(absPath: string): Promise<boolean> {
     return fsapi.pathExists(absPath);
 }
 
-export function pathExistsSync(absPath: string): boolean {
+function pathExistsSyncImpl(absPath: string): boolean {
     return fsapi.pathExistsSync(absPath);
 }
 
+export function pathExistsSync(absPath: string): boolean {
+    return pathExistsSyncImpl(absPath);
+}
+
 function readFileImpl(filePath: string): Promise<string> {
     return fsapi.readFile(filePath, 'utf-8');
 }
@@ -49,9 +53,15 @@ export const fileUtilsNodeUtils = {
     readFile: readFileImpl
 };
 
-// Keep original exports for backwards compatibility
-export const pathExists = fileUtilsNodeUtils.pathExists;
-export const readFile = fileUtilsNodeUtils.readFile;
+// Delegation wrappers that call through fileUtilsNodeUtils at runtime
+// This allows test stubs to take effect
+export function pathExists(absPath: string): Promise<boolean> {
+    return fileUtilsNodeUtils.pathExists(absPath);
+}
+
+export function readFile(filePath: string): Promise<string> {
+    return fileUtilsNodeUtils.readFile(filePath);
+}
 
 export const untildify: (value: string) => string = (value) => untilidfyCommon(value, homedir());