diff --git a/src/client/testing/testController/common/server.ts b/src/client/testing/testController/common/server.ts index c10d63ebfdda..fb54fdd649e7 100644 --- a/src/client/testing/testController/common/server.ts +++ b/src/client/testing/testController/common/server.ts @@ -32,7 +32,6 @@ export class PythonTestServer implements ITestServer, Disposable { private _onDiscoveryDataReceived: EventEmitter = new EventEmitter(); constructor(private executionFactory: IPythonExecutionFactory, private debugLauncher: ITestDebugLauncher) { - traceLog('ABCDEFG::: testing for UUID, if no error then good'); this.server = net.createServer((socket: net.Socket) => { let buffer: Buffer = Buffer.alloc(0); // Buffer to accumulate received data socket.on('data', (data: Buffer) => { @@ -43,7 +42,6 @@ export class PythonTestServer implements ITestServer, Disposable { const rpcHeaders = jsonRPCHeaders(buffer.toString()); const uuid = rpcHeaders.headers.get(JSONRPC_UUID_HEADER); const totalContentLength = rpcHeaders.headers.get('Content-Length'); - traceLog('ABCDEFG::: testing for UUID, if no error then good', uuid); if (!uuid) { traceError('On data received: Error occurred because payload UUID is undefined'); this._onDataReceived.fire({ uuid: '', data: '' }); @@ -124,7 +122,6 @@ export class PythonTestServer implements ITestServer, Disposable { } public deleteUUID(uuid: string): void { - traceLog('ABCDEFG::: DELETE IS OCCURRRING'); this.uuids = this.uuids.filter((u) => u !== uuid); } @@ -228,8 +225,6 @@ export class PythonTestServer implements ITestServer, Disposable { errors: [(ex as Error).message], }), }); - } finally { - traceLog('ABCDEFG::: done with send command, NO deletion :)'); } } } diff --git a/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts b/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts index e371aa12dd01..3d43fd639d8b 100644 --- a/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts +++ b/src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts @@ -84,7 +84,6 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter { const result = execService?.execObservable(execArgs, spawnOptions); result?.proc?.on('close', () => { - traceLog('ABCDEFG::: callback on proc close, delete UUID.', uuid); deferred2.resolve({ stdout: '', stderr: '' }); this.testServer.deleteUUID(uuid); deferred.resolve(); diff --git a/src/client/testing/testController/pytest/pytestExecutionAdapter.ts b/src/client/testing/testController/pytest/pytestExecutionAdapter.ts index f20ca133efcb..7cc718cfce24 100644 --- a/src/client/testing/testController/pytest/pytestExecutionAdapter.ts +++ b/src/client/testing/testController/pytest/pytestExecutionAdapter.ts @@ -48,7 +48,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter { debugLauncher?: ITestDebugLauncher, ): Promise { const uuid = this.testServer.createUUID(uri.fsPath); - traceLog('ABCDEFG::: create UUID for run', uuid); traceVerbose(uri, testIds, debugBool); const disposedDataReceived = this.testServer.onRunDataReceived((e: DataReceivedEvent) => { if (runInstance) { @@ -56,7 +55,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter { } }); const dispose = function (testServer: ITestServer) { - traceLog('ABCDEFG::: dispose w/ uuid', uuid); testServer.deleteUUID(uuid); disposedDataReceived.dispose(); }; @@ -168,7 +166,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter { }); result?.proc?.on('close', () => { - traceLog('ABCDEFG::: callback on proc close, delete UUID.', uuid); deferred2.resolve({ stdout: '', stderr: '' }); this.testServer.deleteUUID(uuid); deferred.resolve(); diff --git a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts index 489835d454fe..acf973b7be07 100644 --- a/src/client/testing/testController/unittest/testDiscoveryAdapter.ts +++ b/src/client/testing/testController/unittest/testDiscoveryAdapter.ts @@ -14,7 +14,6 @@ import { TestCommandOptions, TestDiscoveryCommand, } from '../common/types'; -import { traceLog } from '../../../logging'; /** * Wrapper class for unittest test discovery. This is where we call `runTestCommand`. @@ -35,7 +34,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter { const command = buildDiscoveryCommand(unittestArgs); const uuid = this.testServer.createUUID(uri.fsPath); - traceLog(`ABCDEFG: create UUID ${uuid}`); const options: TestCommandOptions = { workspaceFolder: uri, diff --git a/src/client/testing/testController/unittest/testExecutionAdapter.ts b/src/client/testing/testController/unittest/testExecutionAdapter.ts index 289d9daa86f3..9492b0fb5b04 100644 --- a/src/client/testing/testController/unittest/testExecutionAdapter.ts +++ b/src/client/testing/testController/unittest/testExecutionAdapter.ts @@ -37,14 +37,12 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter { runInstance?: TestRun, ): Promise { const uuid = this.testServer.createUUID(uri.fsPath); - traceLog('ABCDEFG::: created UUID', uuid); const disposedDataReceived = this.testServer.onRunDataReceived((e: DataReceivedEvent) => { if (runInstance) { this.resultResolver?.resolveExecution(JSON.parse(e.data), runInstance); } }); const dispose = function () { - traceLog('ABCDEFG::: no dispose of uuid :)'); disposedDataReceived.dispose(); }; runInstance?.token.onCancellationRequested(() => { @@ -90,7 +88,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter { const runTestIdsPort = await startTestIdServer(testIds); await this.testServer.sendCommand(options, runTestIdsPort.toString(), runInstance, () => { - traceLog('ABCDEFG::: resolve deferred, of send command in execution to then call delete UUID'); this.testServer.deleteUUID(uuid); deferred.resolve(); dispose?.();