small cleanup

microsoft · Jul 19, 2023 · c6dc362 · c6dc362
1 parent 6d32bf7
commit c6dc362
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 40 deletions.
diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts
@@ -197,10 +197,10 @@ export class PythonTestServer implements ITestServer, Disposable {
             } else {
                 if (isRun) {
                     // This means it is running the test
-                    traceInfo(`EJFB Running unittests with arguments: ${args}\r\n`);
+                    traceInfo(`Running unittests with arguments: ${args}\r\n`);
                 } else {
                     // This means it is running discovery
-                    traceLog(`EJFB Discovering unittest tests with arguments: ${args}\r\n`);
+                    traceLog(`Discovering unittest tests with arguments: ${args}\r\n`);
                 }
                 const deferred = createDeferred<ExecutionResult<string>>();
 

diff --git a/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts b/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts
@@ -79,26 +79,15 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
         };
         const execService = await executionFactory?.createActivatedEnvironment(creationOptions);
         // delete UUID following entire discovery finishing.
-        const deferred2 = createDeferred<ExecutionResult<string>>();
+        const deferredExec = createDeferred<ExecutionResult<string>>();
         const execArgs = ['-m', 'pytest', '-p', 'vscode_pytest', '--collect-only'].concat(pytestArgs);
         const result = execService?.execObservable(execArgs, spawnOptions);
 
         result?.proc?.on('close', () => {
-            deferred2.resolve({ stdout: '', stderr: '' });
+            deferredExec.resolve({ stdout: '', stderr: '' });
             this.testServer.deleteUUID(uuid);
             deferred.resolve();
         });
-        await deferred2.promise;
-
-        //     .then(() => {
-        //         this.testServer.deleteUUID(uuid);
-        //         return deferred.resolve();
-        //     })
-        //     .catch((err) => {
-        //         traceError(`Error while trying to run pytest discovery, \n${err}\r\n\r\n`);
-        //         this.testServer.deleteUUID(uuid);
-        //         return deferred.reject(err);
-        //     });
-        // return deferred.promise;
+        await deferredExec.promise;
     }
 }
diff --git a/src/client/testing/testController/pytest/pytestExecutionAdapter.ts b/src/client/testing/testController/pytest/pytestExecutionAdapter.ts
@@ -25,12 +25,6 @@ import { PYTEST_PROVIDER } from '../../common/constants';
 import { EXTENSION_ROOT_DIR } from '../../../common/constants';
 import { startTestIdServer } from '../common/utils';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-// (global as any).EXTENSION_ROOT_DIR = EXTENSION_ROOT_DIR;
-/**
- * Wrapper Class for pytest test execution..
- */
-
 export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
     constructor(
         public testServer: ITestServer,
@@ -61,11 +55,8 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
         runInstance?.token.onCancellationRequested(() => {
             dispose(this.testServer);
         });
-        try {
-            await this.runTestsNew(uri, testIds, uuid, runInstance, debugBool, executionFactory, debugLauncher);
-        } finally {
-            // dispose(this.testServer);
-        }
+        await this.runTestsNew(uri, testIds, uuid, runInstance, debugBool, executionFactory, debugLauncher);
+
         // placeholder until after the rewrite is adopted
         // TODO: remove after adoption.
         const executionPayload: ExecutionTestPayload = {
@@ -158,19 +149,19 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
                 const runArgs = [scriptPath, ...testArgs];
                 traceInfo(`Running pytests with arguments: ${runArgs.join(' ')}\r\n`);
 
-                const deferred2 = createDeferred<ExecutionResult<string>>();
+                const deferredExec = createDeferred<ExecutionResult<string>>();
                 const result = execService?.execObservable(runArgs, spawnOptions);
 
                 runInstance?.token.onCancellationRequested(() => {
                     result?.proc?.kill();
                 });
 
                 result?.proc?.on('close', () => {
-                    deferred2.resolve({ stdout: '', stderr: '' });
+                    deferredExec.resolve({ stdout: '', stderr: '' });
                     this.testServer.deleteUUID(uuid);
                     deferred.resolve();
                 });
-                await deferred2.promise;
+                await deferredExec.promise;
             }
         } catch (ex) {
             traceError(`Error while running tests: ${testIds}\r\n${ex}\r\n\r\n`);

diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts
@@ -51,11 +51,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
             this.testServer.deleteUUID(uuid);
             disposable.dispose();
         });
-
-        // finally {
-        //     this.testServer.deleteUUID(uuid);
-        //     disposable.dispose();
-        // }
         // placeholder until after the rewrite is adopted
         // TODO: remove after adoption.
         const discoveryPayload: DiscoveredTestPayload = {

diff --git a/src/client/testing/testController/unittest/testExecutionAdapter.ts b/src/client/testing/testController/unittest/testExecutionAdapter.ts
@@ -49,11 +49,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
             this.testServer.deleteUUID(uuid);
             dispose();
         });
-        try {
-            await this.runTestsNew(uri, testIds, uuid, runInstance, debugBool, dispose);
-        } finally {
-            // dispose(this.testServer);
-        }
+        await this.runTestsNew(uri, testIds, uuid, runInstance, debugBool, dispose);
         const executionPayload: ExecutionTestPayload = { cwd: uri.fsPath, status: 'success', error: '' };
         return executionPayload;
     }