copy changes for #948 and #1353 into multroot

DonJayamanne · DonJayamanne · commit c753dbe8b959 · 2017-10-29T05:19:40.000-07:00
diff --git a/src/client/unittests/unittest/runner.ts b/src/client/unittests/unittest/runner.ts
@@ -87,7 +87,8 @@ export function runTest(testManager: BaseTestManager, testResultsService: ITestR
 
             testArgs.push(`--result-port=${port}`);
             if (debug === true) {
-                testArgs.push(...['--secret=my_secret', '--port=3000']);
+                const debugPort = PythonSettings.getInstance(Uri.file(rootDirectory)).unitTest.debugPort;
+                testArgs.push(...['--secret=my_secret', `--port=${debugPort}`]);
             }
             testArgs.push(`--us=${startTestDiscoveryDirectory}`);
             if (testId.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ export function runTest(testManager: BaseTestManager, testResultsService: ITestR`
`87`	`87`
`88`	`88`	testArgs.push(`--result-port=${port}`);
`89`	`89`	`if (debug === true) {`
`90`		`- testArgs.push(...['--secret=my_secret', '--port=3000']);`
	`90`	`+ const debugPort = PythonSettings.getInstance(Uri.file(rootDirectory)).unitTest.debugPort;`
	`91`	+ testArgs.push(...['--secret=my_secret', `--port=${debugPort}`]);
`91`	`92`	`}`
`92`	`93`	testArgs.push(`--us=${startTestDiscoveryDirectory}`);
`93`	`94`	`if (testId.length > 0) {`