Make remote debugging unit tests more robust

Fixes #1424
microsoft · Apr 17, 2018 · bd36aeb · bd36aeb
1 parent 95b38cb
commit bd36aeb
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/test/debugger/attach.ptvsd.test.ts b/src/test/debugger/attach.ptvsd.test.ts
@@ -98,8 +98,6 @@ suite('Attach Debugger - Experimental', () => {
             debugClient.waitForEvent('initialized')
         ]);
 
-        await debugClient.configurationDoneRequest();
-
         const stdOutPromise = debugClient.assertOutput('stdout', 'this is stdout');
         const stdErrPromise = debugClient.assertOutput('stderr', 'this is stderr');
 
@@ -112,22 +110,23 @@ suite('Attach Debugger - Experimental', () => {
             source: { path: breakpointLocation.path }
         });
         const exceptionBreakpointPromise = debugClient.setExceptionBreakpointsRequest({ filters: [] });
+        const breakpointStoppedPromise = debugClient.assertStoppedLocation('breakpoint', breakpointLocation);
         await Promise.all([
-            breakpointPromise,
-            exceptionBreakpointPromise,
-            stdOutPromise, stdErrPromise
+            breakpointPromise, exceptionBreakpointPromise,
+            debugClient.configurationDoneRequest(), debugClient.threadsRequest(),
+            stdOutPromise, stdErrPromise,
+            breakpointStoppedPromise
         ]);
 
-        await debugClient.assertStoppedLocation('breakpoint', breakpointLocation);
-
         await Promise.all([
             continueDebugging(debugClient),
             debugClient.assertOutput('stdout', 'this is print'),
             debugClient.waitForEvent('exited'),
             debugClient.waitForEvent('terminated')
         ]);
     }
-    test('Confirm we are able to attach to a running program', async () => {
+    test('Confirm we are able to attach to a running program', async function () {
+        this.retries(0);
         await testAttachingToRemoteProcess(path.dirname(fileToDebug), path.dirname(fileToDebug), IS_WINDOWS);
     });
     test('Confirm local and remote paths are translated', async () => {