Skip to content

remove unneeded multiroot code #21295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 24, 2023
Merged

remove unneeded multiroot code #21295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a31c9e7
remove unneeded multiroot code
eleanorjboyd May 24, 2023
899daec
fix unused variables
eleanorjboyd May 24, 2023
3c23e48
Merge branch 'main' into fix-multiroot
eleanorjboyd May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/client/testing/testController/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
testAdapter.discoverTests(
this.testController,
this.refreshCancellation.token,
this.testAdapters.size > 1,
this.workspaceService.workspaceFile?.fsPath,
this.pythonExecFactory,
);
} else {
Expand All @@ -274,8 +272,7 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
testAdapter.discoverTests(
this.testController,
this.refreshCancellation.token,
this.testAdapters.size > 1,
this.workspaceService.workspaceFile?.fsPath,
this.pythonExecFactory,
);
} else {
// else use OLD test discovery mechanism
Expand Down
43 changes: 1 addition & 42 deletions src/client/testing/testController/workspaceTestAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@ import {
getTestCaseNodes,
RunTestTag,
} from './common/testItemUtilities';
import {
DiscoveredTestItem,
DiscoveredTestNode,
DiscoveredTestType,
ITestDiscoveryAdapter,
ITestExecutionAdapter,
} from './common/types';
import { DiscoveredTestItem, DiscoveredTestNode, ITestDiscoveryAdapter, ITestExecutionAdapter } from './common/types';
import { fixLogLines } from './common/utils';
import { IPythonExecutionFactory } from '../../common/process/types';
import { ITestDebugLauncher } from '../common/types';
Expand Down Expand Up @@ -288,8 +282,6 @@ export class WorkspaceTestAdapter {
public async discoverTests(
testController: TestController,
token?: CancellationToken,
isMultiroot?: boolean,
workspaceFilePath?: string,
executionFactory?: IPythonExecutionFactory,
): Promise<void> {
sendTelemetryEvent(EventName.UNITTEST_DISCOVERING, undefined, { tool: this.testProvider });
Expand Down Expand Up @@ -367,39 +359,6 @@ export class WorkspaceTestAdapter {
// then parse and insert test data.
testController.items.delete(`DiscoveryError:${workspacePath}`);

// Wrap the data under a root node named after the test provider.
const wrappedTests = rawTestData.tests;

// If we are in a multiroot workspace scenario, wrap the current folder's test result in a tree under the overall root + the current folder name.
let rootPath = workspacePath;
let childrenRootPath = rootPath;
let childrenRootName = path.basename(rootPath);

if (isMultiroot) {
rootPath = workspaceFilePath!;
childrenRootPath = workspacePath;
childrenRootName = path.basename(workspacePath);
}

const children = [
{
path: childrenRootPath,
name: childrenRootName,
type_: 'folder' as DiscoveredTestType,
id_: childrenRootPath,
children: wrappedTests ? [wrappedTests] : [],
},
];

// Update the raw test data with the wrapped data.
rawTestData.tests = {
path: rootPath,
name: this.testProvider,
type_: 'folder',
id_: rootPath,
children,
};

if (rawTestData.tests) {
// If the test root for this folder exists: Workspace refresh, update its children.
// Otherwise, it is a freshly discovered workspace, and we need to create a new test root and populate the test tree.
Expand Down