remove logOutputChannel from adapters

Author: eleanorjboyd

src/client/testing/testController/controller.ts

@@ -25,7 +25,7 @@ import { IExtensionSingleActivationService } from '../../activation/types';
 import { ICommandManager, IWorkspaceService } from '../../common/application/types';
 import * as constants from '../../common/constants';
 import { IPythonExecutionFactory } from '../../common/process/types';
-import { IConfigurationService, IDisposableRegistry, ILogOutputChannel, Resource } from '../../common/types';
+import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
 import { noop } from '../../common/utils/misc';
 import { IInterpreterService } from '../../interpreter/contracts';
@@ -98,7 +98,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         @inject(ICommandManager) private readonly commandManager: ICommandManager,
         @inject(IPythonExecutionFactory) private readonly pythonExecFactory: IPythonExecutionFactory,
         @inject(ITestDebugLauncher) private readonly debugLauncher: ITestDebugLauncher,
-        @inject(ILogOutputChannel) private readonly logOutputChannel: ILogOutputChannel,
         @inject(IEnvironmentVariablesProvider) private readonly envVarsService: IEnvironmentVariablesProvider,
     ) {
         this.refreshCancellation = new CancellationTokenSource();
@@ -176,13 +175,11 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                 resultResolver = new PythonResultResolver(this.testController, testProvider, workspace.uri);
                 discoveryAdapter = new UnittestTestDiscoveryAdapter(
                     this.configSettings,
-                    this.logOutputChannel,
                     resultResolver,
                     this.envVarsService,
                 );
                 executionAdapter = new UnittestTestExecutionAdapter(
                     this.configSettings,
-                    this.logOutputChannel,
                     resultResolver,
                     this.envVarsService,
                 );
@@ -191,13 +188,11 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                 resultResolver = new PythonResultResolver(this.testController, testProvider, workspace.uri);
                 discoveryAdapter = new PytestTestDiscoveryAdapter(
                     this.configSettings,
-                    this.logOutputChannel,
                     resultResolver,
                     this.envVarsService,
                 );
                 executionAdapter = new PytestTestExecutionAdapter(
                     this.configSettings,
-                    this.logOutputChannel,
                     resultResolver,
                     this.envVarsService,
                 );

src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts

@@ -9,7 +9,7 @@ import {
     IPythonExecutionFactory,
     SpawnOptions,
 } from '../../../common/process/types';
-import { IConfigurationService, ILogOutputChannel } from '../../../common/types';
+import { IConfigurationService } from '../../../common/types';
 import { createDeferred, Deferred } from '../../../common/utils/async';
 import { EXTENSION_ROOT_DIR } from '../../../constants';
 import { traceError, traceInfo, traceVerbose, traceWarn } from '../../../logging';
@@ -32,7 +32,6 @@ import { useEnvExtension, getEnvironment, runInBackground } from '../../../envEx
 export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
     constructor(
         public configSettings: IConfigurationService,
-        private readonly outputChannel: ILogOutputChannel,
         private readonly resultResolver?: ITestResultResolver,
         private readonly envVarsService?: IEnvironmentVariablesProvider,
     ) {}
@@ -161,7 +160,6 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
         const spawnOptions: SpawnOptions = {
             cwd,
             throwOnStdErr: true,
-            outputChannel: this.outputChannel,
             env: mutableEnv,
             token,
         };

src/client/testing/testController/pytest/pytestExecutionAdapter.ts

@@ -4,7 +4,7 @@
 import { CancellationTokenSource, DebugSessionOptions, TestRun, TestRunProfileKind, Uri } from 'vscode';
 import * as path from 'path';
 import { ChildProcess } from 'child_process';
-import { IConfigurationService, ILogOutputChannel } from '../../../common/types';
+import { IConfigurationService } from '../../../common/types';
 import { Deferred } from '../../../common/utils/async';
 import { traceError, traceInfo, traceVerbose } from '../../../logging';
 import { ExecutionTestPayload, ITestExecutionAdapter, ITestResultResolver } from '../common/types';
@@ -25,7 +25,6 @@ import { getEnvironment, runInBackground, useEnvExtension } from '../../../envEx
 export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
     constructor(
         public configSettings: IConfigurationService,
-        private readonly outputChannel: ILogOutputChannel,
         private readonly resultResolver?: ITestResultResolver,
         private readonly envVarsService?: IEnvironmentVariablesProvider,
     ) {}
@@ -146,7 +145,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
             const spawnOptions: SpawnOptions = {
                 cwd,
                 throwOnStdErr: true,
-                outputChannel: this.outputChannel,
                 env: mutableEnv,
                 token: runInstance?.token,
             };

src/client/testing/testController/unittest/testDiscoveryAdapter.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import { CancellationTokenSource, Uri } from 'vscode';
 import { CancellationToken } from 'vscode-jsonrpc';
 import { ChildProcess } from 'child_process';
-import { IConfigurationService, ILogOutputChannel } from '../../../common/types';
+import { IConfigurationService } from '../../../common/types';
 import { EXTENSION_ROOT_DIR } from '../../../constants';
 import {
     DiscoveredTestPayload,
@@ -32,7 +32,6 @@ import { getEnvironment, runInBackground, useEnvExtension } from '../../../envEx
 export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
     constructor(
         public configSettings: IConfigurationService,
-        private readonly logOutputChannel: ILogOutputChannel,
         private readonly resultResolver?: ITestResultResolver,
         private readonly envVarsService?: IEnvironmentVariablesProvider,
     ) {}
@@ -74,7 +73,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
             workspaceFolder: uri,
             command,
             cwd,
-            outChannel: this.logOutputChannel,
             token,
         };
 
@@ -147,7 +145,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
             token: options.token,
             cwd: options.cwd,
             throwOnStdErr: true,
-            outputChannel: options.outChannel,
             env: mutableEnv,
         };
 

src/client/testing/testController/unittest/testExecutionAdapter.ts

@@ -4,7 +4,7 @@
 import * as path from 'path';
 import { CancellationTokenSource, DebugSessionOptions, TestRun, TestRunProfileKind, Uri } from 'vscode';
 import { ChildProcess } from 'child_process';
-import { IConfigurationService, ILogOutputChannel } from '../../../common/types';
+import { IConfigurationService } from '../../../common/types';
 import { Deferred, createDeferred } from '../../../common/utils/async';
 import { EXTENSION_ROOT_DIR } from '../../../constants';
 import {
@@ -35,7 +35,6 @@ import { getEnvironment, runInBackground, useEnvExtension } from '../../../envEx
 export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
     constructor(
         public configSettings: IConfigurationService,
-        private readonly outputChannel: ILogOutputChannel,
         private readonly resultResolver?: ITestResultResolver,
         private readonly envVarsService?: IEnvironmentVariablesProvider,
     ) {}
@@ -122,7 +121,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
             cwd,
             profileKind,
             testIds,
-            outChannel: this.outputChannel,
             token: runInstance?.token,
         };
         traceLog(`Running UNITTEST execution for the following test ids: ${testIds}`);
@@ -140,7 +138,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
             token: options.token,
             cwd: options.cwd,
             throwOnStdErr: true,
-            outputChannel: options.outChannel,
             env: mutableEnv,
         };
         // Create the Python environment in which to execute the command.