neviim
diff --git a/‎news/3 Code Health/2307.md
+1 b/‎news/3 Code Health/2307.md
+1
diff --git a/‎src/client/debugger/DebugClients/LocalDebugClient.ts
+3-2 b/‎src/client/debugger/DebugClients/LocalDebugClient.ts
+3-2
diff --git a/‎src/client/debugger/DebugClients/RemoteDebugClient.ts
+2-1 b/‎src/client/debugger/DebugClients/RemoteDebugClient.ts
+2-1
diff --git a/‎src/test/debugger/attach.ptvsd.test.ts
-6 b/‎src/test/debugger/attach.ptvsd.test.ts
-6
diff --git a/‎src/test/debugger/attach.test.ts
-125 b/‎src/test/debugger/attach.test.ts
-125
diff --git a/‎src/test/debugger/capabilities.test.ts
+3 b/‎src/test/debugger/capabilities.test.ts
+3
@@ -0,0 +1 @@
+Remove some of the debugger tests and fix some minor debugger issues.
@@ -2,6 +2,7 @@ import { ChildProcess, spawn } from 'child_process';
 import * as path from 'path';
 import { DebugSession, OutputEvent } from 'vscode-debugadapter';
 import { DebugProtocol } from 'vscode-debugprotocol';
+import { noop } from '../../common/core.utils';
 import { open } from '../../common/open';
 import { PathUtils } from '../../common/platform/pathUtils';
 import { CurrentProcess } from '../../common/process/currentProcess';
@@ -15,7 +16,6 @@ import { LocalDebugServerV2 } from '../DebugServers/LocalDebugServerV2';
 import { IDebugLauncherScriptProvider } from '../types';
 import { DebugClient, DebugType } from './DebugClient';
 import { DebugClientHelper } from './helper';
-import { noop } from '../../common/core.utils';
 
 const VALID_DEBUG_OPTIONS = [
     'RedirectOutput',
@@ -49,7 +49,8 @@ export class LocalDebugClient extends DebugClient<LaunchRequestArguments> {
     }
 
     public CreateDebugServer(_pythonProcess?: IPythonProcess, serviceContainer?: IServiceContainer): BaseDebugServer {
-        return new LocalDebugServerV2(this.debugSession, this.args, serviceContainer!);
+        this.debugServer =  new LocalDebugServerV2(this.debugSession, this.args, serviceContainer!);
+        return this.debugServer;
     }
 
     public get DebugType(): DebugType {
 
@@ -14,7 +14,8 @@ export class RemoteDebugClient<T extends BaseAttachRequestArguments> extends Deb
 
     public CreateDebugServer(_pythonProcess?: IPythonProcess): BaseDebugServer {
         // tslint:disable-next-line:no-any
-        return new RemoteDebugServerV2(this.debugSession, undefined as any, this.args);
+        this.debugServer = new RemoteDebugServerV2(this.debugSession, undefined as any, this.args);
+        return this.debugServer;
     }
     public get DebugType(): DebugType {
         return DebugType.Remote;
 
@@ -128,10 +128,4 @@ suite('Attach Debugger', () => {
     test('Confirm we are able to attach to a running program', async () => {
         await testAttachingToRemoteProcess(path.dirname(fileToDebug), path.dirname(fileToDebug), IS_WINDOWS);
     });
-    test('Confirm local and remote paths are translated', async () => {
-        // If tests are running on windows, then treat debug client as a unix client and remote process as current OS.
-        const isLocalHostWindows = !IS_WINDOWS;
-        const localWorkspace = isLocalHostWindows ? 'C:\\Project\\src' : '/home/user/Desktop/project/src';
-        await testAttachingToRemoteProcess(localWorkspace, path.dirname(fileToDebug), isLocalHostWindows);
-    });
 });
@@ -96,6 +96,9 @@ suite('Debugging - Capabilities', () => {
         protocolWriter.write(socket!, initializeRequest);
         const actualResponse = await actualResponsePromise;
 
+        // supportsDebuggerProperties is not documented, most probably a VS specific item.
+        const body: any = actualResponse.body;
+        delete body.supportsDebuggerProperties;
         expect(actualResponse.body).to.deep.equal(expectedResponse.body);
     });
 });
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Remove some of the debugger tests and fix some minor debugger issues.`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ export class RemoteDebugClient<T extends BaseAttachRequestArguments> extends Deb`
`14`	`14`
`15`	`15`	`public CreateDebugServer(_pythonProcess?: IPythonProcess): BaseDebugServer {`
`16`	`16`	`// tslint:disable-next-line:no-any`
`17`		`- return new RemoteDebugServerV2(this.debugSession, undefined as any, this.args);`
	`17`	`+ this.debugServer = new RemoteDebugServerV2(this.debugSession, undefined as any, this.args);`
	`18`	`+ return this.debugServer;`
`18`	`19`	`}`
`19`	`20`	`public get DebugType(): DebugType {`
`20`	`21`	`return DebugType.Remote;`