Fix debugger attach tests (microsoft#2656)

DonJayamanne · web-flow · commit 4a18c8be3d8b · 2018-09-21T09:23:13.000-07:00
For microsoft#2655
diff --git a/news/2 Fixes/2655.md b/news/2 Fixes/2655.md
@@ -0,0 +1 @@
+Fix debug adapter `Attach` test.
diff --git a/src/test/debugger/attach.ptvsd.test.ts b/src/test/debugger/attach.ptvsd.test.ts
@@ -20,17 +20,16 @@ import { DebuggerTypeName, PTVSD_PATH } from '../../client/debugger/Common/const
 import { AttachRequestArguments, DebugOptions } from '../../client/debugger/Common/Contracts';
 import { IServiceContainer } from '../../client/ioc/types';
 import { PYTHON_PATH, sleep } from '../common';
-import { initialize, IS_MULTI_ROOT_TEST, TEST_DEBUGGER } from '../initialize';
+import { IS_MULTI_ROOT_TEST, TEST_DEBUGGER } from '../initialize';
 import { continueDebugging, createDebugAdapter } from './utils';
 
 const fileToDebug = path.join(EXTENSION_ROOT_DIR, 'src', 'testMultiRootWkspc', 'workspace5', 'remoteDebugger-start-with-ptvsd.py');
 
 suite('Attach Debugger', () => {
     let debugClient: DebugClient;
     let proc: ChildProcess;
-    suiteSetup(initialize);
 
-    setup(async function () {
+    setup(async function() {
         if (!IS_MULTI_ROOT_TEST || !TEST_DEBUGGER) {
             this.skip();
         }
@@ -58,7 +57,7 @@ suite('Attach Debugger', () => {
         // Set the path for PTVSD to be picked up.
         // tslint:disable-next-line:no-string-literal
         env['PYTHONPATH'] = PTVSD_PATH;
-        const pythonArgs = ['-m', 'ptvsd', '--server', '--port', `${port}`, '--file', fileToDebug.fileToCommandArgument()];
+        const pythonArgs = ['-m', 'ptvsd', '--server', '--wait', '--port', `${port}`, '--file', fileToDebug.fileToCommandArgument()];
         proc = spawn(PYTHON_PATH, pythonArgs, { env: env, cwd: path.dirname(fileToDebug) });
         await sleep(3000);
 
diff --git a/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.py b/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-ptvsd.py
@@ -1,14 +1,17 @@
 import sys
 import time
-time.sleep(2)
-sys.stdout.write('this is stdout')
-sys.stdout.flush()
-sys.stderr.write('this is stderr')
-sys.stderr.flush()
-# Give the debugger some time to add a breakpoint.
-time.sleep(5)
-for i in range(1):
-    time.sleep(0.5)
-    pass
 
-print('this is print')
+def main():
+    sys.stdout.write('this is stdout')
+    sys.stdout.flush()
+    sys.stderr.write('this is stderr')
+    sys.stderr.flush()
+    # Give the debugger some time to add a breakpoint.
+    time.sleep(5)
+    for i in range(1):
+        time.sleep(0.5)
+        pass
+
+    print('this is print')
+
+main()
