Skip to content

Commit 01497c7

Browse files
committed
Fix test adapter unit tests
1 parent c86a5a2 commit 01497c7

File tree

5 files changed

+24
-0
lines changed

5 files changed

+24
-0
lines changed

src/test/testing/testController/pytest/pytestDiscoveryAdapter.unit.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { EXTENSION_ROOT_DIR } from '../../../../client/constants';
2020
import { MockChildProcess } from '../../../mocks/mockChildProcess';
2121
import { Deferred, createDeferred } from '../../../../client/common/utils/async';
2222
import * as util from '../../../../client/testing/testController/common/utils';
23+
import * as extapi from '../../../../client/envExt/api.internal';
2324

2425
suite('pytest test discovery adapter', () => {
2526
let configService: IConfigurationService;
@@ -34,8 +35,12 @@ suite('pytest test discovery adapter', () => {
3435
let mockProc: MockChildProcess;
3536
let deferred2: Deferred<void>;
3637
let utilsStartDiscoveryNamedPipeStub: sinon.SinonStub;
38+
let useEnvExtensionStub: sinon.SinonStub;
3739

3840
setup(() => {
41+
useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
42+
useEnvExtensionStub.returns(false);
43+
3944
const mockExtensionRootDir = typeMoq.Mock.ofType<string>();
4045
mockExtensionRootDir.setup((m) => m.toString()).returns(() => '/mocked/extension/root/dir');
4146

src/test/testing/testController/pytest/pytestExecutionAdapter.unit.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ import * as util from '../../../../client/testing/testController/common/utils';
2121
import { EXTENSION_ROOT_DIR } from '../../../../client/constants';
2222
import { MockChildProcess } from '../../../mocks/mockChildProcess';
2323
import { traceInfo } from '../../../../client/logging';
24+
import * as extapi from '../../../../client/envExt/api.internal';
2425

2526
suite('pytest test execution adapter', () => {
27+
let useEnvExtensionStub: sinon.SinonStub;
2628
let configService: IConfigurationService;
2729
let execFactory = typeMoq.Mock.ofType<IPythonExecutionFactory>();
2830
let adapter: PytestTestExecutionAdapter;
@@ -35,7 +37,10 @@ suite('pytest test execution adapter', () => {
3537
let mockProc: MockChildProcess;
3638
let utilsWriteTestIdsFileStub: sinon.SinonStub;
3739
let utilsStartRunResultNamedPipeStub: sinon.SinonStub;
40+
3841
setup(() => {
42+
useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
43+
useEnvExtensionStub.returns(false);
3944
configService = ({
4045
getSettings: () => ({
4146
testing: { pytestArgs: ['.'] },

src/test/testing/testController/testCancellationRunAdapters.unit.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { PytestTestExecutionAdapter } from '../../../client/testing/testControll
1515
import { UnittestTestExecutionAdapter } from '../../../client/testing/testController/unittest/testExecutionAdapter';
1616
import { MockChildProcess } from '../../mocks/mockChildProcess';
1717
import * as util from '../../../client/testing/testController/common/utils';
18+
import * as extapi from '../../../client/envExt/api.internal';
1819

1920
const adapters: Array<string> = ['pytest', 'unittest'];
2021

@@ -32,7 +33,11 @@ suite('Execution Flow Run Adapters', () => {
3233
let utilsStartRunResultNamedPipe: sinon.SinonStub;
3334
let serverDisposeStub: sinon.SinonStub;
3435

36+
let useEnvExtensionStub: sinon.SinonStub;
37+
3538
setup(() => {
39+
useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
40+
useEnvExtensionStub.returns(false);
3641
// general vars
3742
myTestPath = path.join('/', 'my', 'test', 'path', '/');
3843
configService = ({

src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
Output,
2121
SpawnOptions,
2222
} from '../../../../client/common/process/types';
23+
import * as extapi from '../../../../client/envExt/api.internal';
2324

2425
suite('Unittest test discovery adapter', () => {
2526
let stubConfigSettings: IConfigurationService;
@@ -32,8 +33,12 @@ suite('Unittest test discovery adapter', () => {
3233
let expectedPath: string;
3334
let uri: Uri;
3435
let utilsStartDiscoveryNamedPipeStub: sinon.SinonStub;
36+
let useEnvExtensionStub: sinon.SinonStub;
3537

3638
setup(() => {
39+
useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
40+
useEnvExtensionStub.returns(false);
41+
3742
expectedPath = path.join('/', 'new', 'cwd');
3843
stubConfigSettings = ({
3944
getSettings: () => ({

src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { EXTENSION_ROOT_DIR } from '../../../../client/constants';
2121
import { MockChildProcess } from '../../../mocks/mockChildProcess';
2222
import { traceInfo } from '../../../../client/logging';
2323
import { UnittestTestExecutionAdapter } from '../../../../client/testing/testController/unittest/testExecutionAdapter';
24+
import * as extapi from '../../../../client/envExt/api.internal';
2425

2526
suite('Unittest test execution adapter', () => {
2627
let configService: IConfigurationService;
@@ -35,7 +36,10 @@ suite('Unittest test execution adapter', () => {
3536
let mockProc: MockChildProcess;
3637
let utilsWriteTestIdsFileStub: sinon.SinonStub;
3738
let utilsStartRunResultNamedPipeStub: sinon.SinonStub;
39+
let useEnvExtensionStub: sinon.SinonStub;
3840
setup(() => {
41+
useEnvExtensionStub = sinon.stub(extapi, 'useEnvExtension');
42+
useEnvExtensionStub.returns(false);
3943
configService = ({
4044
getSettings: () => ({
4145
testing: { unittestArgs: ['.'] },

0 commit comments

Comments
 (0)