test/integration/goDebug: fix windows tests
Use the forward slash ('/') instead of a backslash ('\\') in paths
checked for breakpoints even on windows, because dlv does. Also delete
a duplicate test (that contained this path mapping bug).
Fixes golang/vscode-go#1284
Change-Id: Ic18fb639b981c7e55c970a9fb27947f98b1bd68f
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/300111
Trust: Suzy Mueller <suzmue@golang.org>
Trust: Hyang-Ah Hana Kim <hyangah@gmail.com>
Run-TryBot: Suzy Mueller <suzmue@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
diff --git a/test/integration/goDebug.test.ts b/test/integration/goDebug.test.ts
index c1a3695..d10a312 100644
--- a/test/integration/goDebug.test.ts
+++ b/test/integration/goDebug.test.ts
@@ -920,8 +920,8 @@
// The file paths returned from delve use '/' not the native path
// separator, so we can replace any instances of '\' with '/', which
// allows the hitBreakpoint check to match.
- const getBreakpointLocation = (FILE: string, LINE: number, useBackSlash = true) => {
- return { path: useBackSlash ? FILE.replace(/\\/g, '/') : FILE, line: LINE };
+ const getBreakpointLocation = (FILE: string, LINE: number) => {
+ return { path: FILE.replace(/\\/g, '/'), line: LINE };
};
suite('setBreakpoints', () => {
@@ -1023,31 +1023,6 @@
await new Promise((resolve) => setTimeout(resolve, 2_000));
});
- test('stopped for a breakpoint set during initialization (remote attach)', async function () {
- if (isDlvDap && dlvDapSkipsEnabled) {
- this.skip(); // not working in dlv-dap.
- }
-
- const FILE = path.join(DATA_ROOT, 'helloWorldServer', 'main.go');
- const BREAKPOINT_LINE = 29;
- const remoteProgram = await setUpRemoteProgram(remoteAttachConfig.port, server);
-
- const breakpointLocation = getBreakpointLocation(FILE, BREAKPOINT_LINE, false);
-
- // Setup attach with a breakpoint.
- await setUpRemoteAttach(remoteAttachDebugConfig, [breakpointLocation]);
-
- // Calls the helloworld server to make the breakpoint hit.
- await waitForBreakpoint(
- () => http.get(`http://localhost:${server}`).on('error', (data) => console.log(data)),
- breakpointLocation
- );
-
- await dc.disconnectRequest({ restart: false });
- await killProcessTree(remoteProgram);
- await new Promise((resolve) => setTimeout(resolve, 2_000));
- });
-
test('should set breakpoints during continue', async function () {
if (isDlvDap && dlvDapSkipsEnabled) {
this.skip(); // not working in dlv-dap.
@@ -1646,7 +1621,7 @@
const BREAKPOINT_LINE = 29;
const remoteProgram = await setUpRemoteProgram(remoteAttachConfig.port, server);
- const breakpointLocation = getBreakpointLocation(FILE, BREAKPOINT_LINE, false);
+ const breakpointLocation = getBreakpointLocation(FILE, BREAKPOINT_LINE);
// Setup attach with a breakpoint.
remoteAttachDebugConfig.cwd = tmpDir;
remoteAttachDebugConfig.remotePath = '';
@@ -1675,7 +1650,7 @@
const BREAKPOINT_LINE = 29;
const remoteProgram = await setUpRemoteProgram(remoteAttachConfig.port, server);
- const breakpointLocation = getBreakpointLocation(FILE, BREAKPOINT_LINE, false);
+ const breakpointLocation = getBreakpointLocation(FILE, BREAKPOINT_LINE);
// Setup attach with a breakpoint.
remoteAttachDebugConfig.cwd = helloWorldLocal;
remoteAttachDebugConfig.remotePath = helloWorldRemote;
