debug: reanable integration tests (use new node debugger)

isidorn · isidorn · commit 2270536e85d0 · 2020-02-11T11:06:24.000+01:00
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts
@@ -37,8 +37,7 @@ suite('Debug', function () {
 		disposeAll(toDispose);
 	});
 
-	// TODO@isidor seems to fail
-	test.skip('start debugging', async function () {
+	test('start debugging', async function () {
 		assert.equal(debug.activeDebugSession, undefined);
 		let stoppedEvents = 0;
 		let variablesReceived: () => void;
@@ -47,7 +46,7 @@ suite('Debug', function () {
 
 		const firstVariablesRetrieved = new Promise<void>(resolve => variablesReceived = resolve);
 		const toDispose: Disposable[] = [];
-		toDispose.push(debug.registerDebugAdapterTrackerFactory('node2', {
+		toDispose.push(debug.registerDebugAdapterTrackerFactory('*', {
 			createDebugAdapterTracker: () => ({
 				onDidSendMessage: m => {
 					if (m.event === 'stopped') {
@@ -68,16 +67,13 @@ suite('Debug', function () {
 
 		const initializedPromise = new Promise<void>(resolve => initializedReceived = resolve);
 		const configurationDonePromise = new Promise<void>(resolve => configurationDoneReceived = resolve);
-		// Do not await debug start to return due to https://github.com/microsoft/vscode/issues/90134
-		debug.startDebugging(workspace.workspaceFolders![0], 'Launch debug.js');
+		const success = await debug.startDebugging(workspace.workspaceFolders![0], 'Launch debug.js');
+		assert.equal(success, true);
 		await initializedPromise;
 		await configurationDonePromise;
 
-		// Do not verify activeDebugSession due to same flakiness that sometimes start debugging does not return
-		// assert.notEqual(debug.activeDebugSession, undefined);
-		// assert.equal(debug.activeDebugSession?.name, 'Launch debug.js');
-
 		await firstVariablesRetrieved;
+		assert.notEqual(debug.activeDebugSession, undefined);
 		assert.equal(stoppedEvents, 1);
 
 		const secondVariablesRetrieved = new Promise<void>(resolve => variablesReceived = resolve);
@@ -110,8 +106,6 @@ suite('Debug', function () {
 		const sessionTerminatedPromise = new Promise<void>(resolve => sessionTerminated = resolve);
 		await commands.executeCommand('workbench.action.debug.stop');
 		await sessionTerminatedPromise;
-		assert.equal(debug.activeDebugSession, undefined);
-
 		disposeAll(toDispose);
 	});
 
diff --git a/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json b/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json
@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "node",
+            "type": "pwa-node",
             "request": "launch",
             "name": "Launch debug.js",
             "stopOnEntry": true,

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"version": "0.2.0",`
`6`	`6`	`"configurations": [`
`7`	`7`	`{`
`8`		`- "type": "node",`
	`8`	`+ "type": "pwa-node",`
`9`	`9`	`"request": "launch",`
`10`	`10`	`"name": "Launch debug.js",`
`11`	`11`	`"stopOnEntry": true,`