wait before setting brkpoint and increate test timeout

Author: DonJayamanne

src/test/debugger/misc.test.ts

@@ -14,7 +14,6 @@ import { noop } from '../../client/common/core.utils';
 import { IS_WINDOWS } from '../../client/common/platform/constants';
 import { FileSystem } from '../../client/common/platform/fileSystem';
 import { PlatformService } from '../../client/common/platform/platformService';
-import { StopWatch } from '../../client/common/stopWatch';
 import { DebugOptions, LaunchRequestArguments } from '../../client/debugger/Common/Contracts';
 import { sleep } from '../common';
 import { IS_MULTI_ROOT_TEST, TEST_DEBUGGER } from '../initialize';
@@ -42,7 +41,6 @@ let testCounter = 0;
             if (!IS_MULTI_ROOT_TEST || !TEST_DEBUGGER) {
                 this.skip();
             }
-            this.timeout(30000);
             await new Promise(resolve => setTimeout(resolve, 1000));
             debugClient = createDebugAdapter();
             debugClient.defaultTimeout = DEBUGGER_TIMEOUT;
@@ -447,37 +445,30 @@ let testCounter = 0;
             const pauseLocation = { path: path.join(debugFilesPath, 'sample3WithEx.py'), line: 5 };
             await debugClient.assertStoppedLocation('exception', pauseLocation);
         });
-        test('Test multi-threaded debugging', async () => {
-            const stopWatch = new StopWatch();
-            console.log(`step1 ${stopWatch.elapsedTime}`);
+        test('Test multi-threaded debugging', async function () {
+            this.timeout(30000);
             await Promise.all([
                 debugClient.configurationSequence(),
                 debugClient.launch(buildLauncArgs('multiThread.py', false)),
                 debugClient.waitForEvent('initialized')
             ]);
-            debugClient.addListener('output', output => {
-                console.log(`stepx ${stopWatch.elapsedTime}, ${JSON.stringify(output)}`);
-            });
-            console.log(`step2 ${stopWatch.elapsedTime}`);
+
+            // Add a delay for debugger to start (sometimes it takes a long time for new debugger to break).
             await sleep(3000);
             const pythonFile = path.join(debugFilesPath, 'multiThread.py');
-            const breakpointLocation = { path: pythonFile, column: 1, line: 15 };
+            const breakpointLocation = { path: pythonFile, column: 1, line: 11 };
             await debugClient.setBreakpointsRequest({
                 lines: [breakpointLocation.line],
                 breakpoints: [{ line: breakpointLocation.line, column: breakpointLocation.column }],
                 source: { path: breakpointLocation.path }
             });
-            console.log(`step3 ${stopWatch.elapsedTime}`);
-            // hit breakpoint.
+
             await debugClient.assertStoppedLocation('breakpoint', breakpointLocation);
-            console.log(`step4 ${stopWatch.elapsedTime}`);
             const threads = await debugClient.threadsRequest();
-            console.log(`step5 ${stopWatch.elapsedTime}`);
             expect(threads.body.threads).of.lengthOf(2, 'incorrect number of threads');
             for (const thread of threads.body.threads) {
                 expect(thread.id).to.be.lessThan(MAX_SIGNED_INT32 + 1, 'ThreadId is not an integer');
             }
-            console.log(`step6 ${stopWatch.elapsedTime}`);
         });
         test('Test stack frames', async () => {
             await Promise.all([

src/test/pythonFiles/debugging/multiThread.py

@@ -1,20 +1,14 @@
-print("step1")
 import sys
 import threading
 import time
-print("step2")
 
 def bar():
-    print("step2-{},bar".format(threading.current_thread().getName()))
     time.sleep(2)
-    print("print-{},bar".format(threading.current_thread().getName()))
+    print('bar')
 
 def foo(x):
     while True:
-        print("step2-{},foo-loop".format(threading.current_thread().getName()))
         bar()
-print("step3")
+
 threading.Thread(target=lambda: foo(2), name="foo").start()
-print("step4")
 foo(1)
-print("step5")