Skip to content

Commit 525ce70

Browse files
DonJayamanneDonJayamanne
authored
Removes most of the flaky debugger tests (#2308)
Fixes #2307
1 parent f01c810 commit 525ce70

11 files changed

Lines changed: 15 additions & 907 deletions

File tree

‎news/3 Code Health/2307.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove some of the debugger tests and fix some minor debugger issues.

‎src/client/debugger/DebugClients/LocalDebugClient.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { ChildProcess, spawn } from 'child_process';
22
import * as path from 'path';
33
import { DebugSession, OutputEvent } from 'vscode-debugadapter';
44
import { DebugProtocol } from 'vscode-debugprotocol';
5+
import { noop } from '../../common/core.utils';
56
import { open } from '../../common/open';
67
import { PathUtils } from '../../common/platform/pathUtils';
78
import { CurrentProcess } from '../../common/process/currentProcess';
@@ -15,7 +16,6 @@ import { LocalDebugServerV2 } from '../DebugServers/LocalDebugServerV2';
1516
import { IDebugLauncherScriptProvider } from '../types';
1617
import { DebugClient, DebugType } from './DebugClient';
1718
import { DebugClientHelper } from './helper';
18-
import { noop } from '../../common/core.utils';
1919

2020
const VALID_DEBUG_OPTIONS = [
2121
'RedirectOutput',
@@ -49,7 +49,8 @@ export class LocalDebugClient extends DebugClient<LaunchRequestArguments> {
4949
}
5050

5151
public CreateDebugServer(_pythonProcess?: IPythonProcess, serviceContainer?: IServiceContainer): BaseDebugServer {
52-
return new LocalDebugServerV2(this.debugSession, this.args, serviceContainer!);
52+
this.debugServer = new LocalDebugServerV2(this.debugSession, this.args, serviceContainer!);
53+
return this.debugServer;
5354
}
5455

5556
public get DebugType(): DebugType {

‎src/client/debugger/DebugClients/RemoteDebugClient.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ export class RemoteDebugClient<T extends BaseAttachRequestArguments> extends Deb
1414

1515
public CreateDebugServer(_pythonProcess?: IPythonProcess): BaseDebugServer {
1616
// 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;
1819
}
1920
public get DebugType(): DebugType {
2021
return DebugType.Remote;

‎src/test/debugger/attach.ptvsd.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,4 @@ suite('Attach Debugger', () => {
128128
test('Confirm we are able to attach to a running program', async () => {
129129
await testAttachingToRemoteProcess(path.dirname(fileToDebug), path.dirname(fileToDebug), IS_WINDOWS);
130130
});
131-
test('Confirm local and remote paths are translated', async () => {
132-
// If tests are running on windows, then treat debug client as a unix client and remote process as current OS.
133-
const isLocalHostWindows = !IS_WINDOWS;
134-
const localWorkspace = isLocalHostWindows ? 'C:\\Project\\src' : '/home/user/Desktop/project/src';
135-
await testAttachingToRemoteProcess(localWorkspace, path.dirname(fileToDebug), isLocalHostWindows);
136-
});
137131
});

‎src/test/debugger/attach.test.ts‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎src/test/debugger/capabilities.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ suite('Debugging - Capabilities', () => {
9696
protocolWriter.write(socket!, initializeRequest);
9797
const actualResponse = await actualResponsePromise;
9898

99+
// supportsDebuggerProperties is not documented, most probably a VS specific item.
100+
const body: any = actualResponse.body;
101+
delete body.supportsDebuggerProperties;
99102
expect(actualResponse.body).to.deep.equal(expectedResponse.body);
100103
});
101104
});

0 commit comments

Comments
 (0)