Skip to content

Commit fc70c4c

Browse files
andravinclaude
andravin
and
claude
committed
Merge upstream/main: resolve conflict in utils.ts
Combined project-scoped IDs feature from upstream with pytest marks as tags feature, preserving both functionalities. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2 parents 6138eda + 502ad70 commit fc70c4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5310
-229
lines changed

‎.github/instructions/testing-workflow.instructions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,3 +578,4 @@ envConfig.inspect
578578
- When mocking `testController.createTestItem()` in unit tests, use `typemoq.It.isAny()` for parameters when testing handler behavior (not ID/label generation logic), but consider using specific matchers (e.g., `It.is((id: string) => id.startsWith('_error_'))`) when the actual values being passed are important for correctness - this balances test precision with maintainability (2)
579579
- Remove unused variables from test code immediately - leftover tracking variables like `validationCallCount` that aren't referenced indicate dead code that should be simplified (1)
580580
- Use `Uri.file(path).fsPath` for both sides of path comparisons in tests to ensure cross-platform compatibility - Windows converts forward slashes to backslashes automatically (1)
581+
- When tests fail with "Cannot stub non-existent property", the method likely moved to a different class during refactoring - find the class that owns the method and test that class directly instead of stubbing on the original class (1)

‎.github/instructions/testing_feature_area.instructions.md‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ This document maps the testing support in the extension: discovery, execution (r
2626
- `src/client/testing/serviceRegistry.ts` — DI/wiring for testing services.
2727
- Workspace orchestration
2828
- `src/client/testing/testController/workspaceTestAdapter.ts` — `WorkspaceTestAdapter` (provider-agnostic entry used by controller).
29+
- **Project-based testing (multi-project workspaces)**
30+
- `src/client/testing/testController/common/testProjectRegistry.ts` — `TestProjectRegistry` (manages project lifecycle, discovery, and nested project handling).
31+
- `src/client/testing/testController/common/projectAdapter.ts` — `ProjectAdapter` interface (represents a single Python project with its own test infrastructure).
32+
- `src/client/testing/testController/common/projectUtils.ts` — utilities for project ID generation, display names, and shared adapter creation.
2933
- Provider adapters
3034
- Unittest
3135
- `src/client/testing/testController/unittest/testDiscoveryAdapter.ts`
@@ -151,6 +155,78 @@ The adapters in the extension don't implement test discovery/run logic themselve
151155
- Settings are consumed by `src/client/testing/common/testConfigurationManager.ts`, `src/client/testing/configurationFactory.ts`, and adapters under `src/client/testing/testController/*` which read settings to build CLI args and env for subprocesses.
152156
- The setting definitions and descriptions are in `package.json` and localized strings in `package.nls.json`.
153157

158+
## Project-based testing (multi-project workspaces)
159+
160+
Project-based testing enables multi-project workspace support where each Python project gets its own test tree root with its own Python environment.
161+
162+
### Architecture
163+
164+
- **TestProjectRegistry** (`testProjectRegistry.ts`): Central registry that:
165+
166+
- Discovers Python projects via the Python Environments API
167+
- Creates and manages `ProjectAdapter` instances per workspace
168+
- Computes nested project relationships and configures ignore lists
169+
- Falls back to "legacy" single-adapter mode when API unavailable
170+
171+
- **ProjectAdapter** (`projectAdapter.ts`): Interface representing a single project with:
172+
- Project identity (ID, name, URI from Python Environments API)
173+
- Python environment with execution details
174+
- Test framework adapters (discovery/execution)
175+
- Nested project ignore paths (for parent projects)
176+
177+
### How it works
178+
179+
1. **Activation**: When the extension activates, `PythonTestController` checks if the Python Environments API is available.
180+
2. **Project discovery**: `TestProjectRegistry.discoverAndRegisterProjects()` queries the API for all Python projects in each workspace.
181+
3. **Nested handling**: `configureNestedProjectIgnores()` identifies child projects and adds their paths to parent projects' ignore lists.
182+
4. **Test discovery**: For each project, the controller calls `project.discoveryAdapter.discoverTests()` with the project's URI. The adapter sets `PROJECT_ROOT_PATH` environment variable for the Python runner.
183+
5. **Python side**:
184+
- For pytest: `get_test_root_path()` in `vscode_pytest/__init__.py` returns `PROJECT_ROOT_PATH` (if set) or falls back to `cwd`.
185+
- For unittest: `discovery.py` uses `PROJECT_ROOT_PATH` as `top_level_dir` and `project_root_path` to root the test tree at the project directory.
186+
6. **Test tree**: Each project gets its own root node in the Test Explorer, with test IDs scoped by project ID using the `@@vsc@@` separator (defined in `projectUtils.ts`).
187+
188+
### Nested project handling: pytest vs unittest
189+
190+
**pytest** supports the `--ignore` flag to exclude paths during test collection. When nested projects are detected, parent projects automatically receive `--ignore` flags for child project paths. This ensures each test appears under exactly one project in the test tree.
191+
192+
**unittest** does not support path exclusion during `discover()`. Therefore, tests in nested project directories may appear under multiple project roots (both the parent and the child project). This is **expected behavior** for unittest:
193+
194+
- Each project discovers and displays all tests it finds within its directory structure
195+
- There is no deduplication or collision detection
196+
- Users may see the same test file under multiple project roots if their project structure has nesting
197+
198+
This approach was chosen because:
199+
200+
1. unittest's `TestLoader.discover()` has no built-in path exclusion mechanism
201+
2. Implementing custom exclusion would add significant complexity with minimal benefit
202+
3. The existing approach is transparent and predictable - each project shows what it finds
203+
204+
### Empty projects and root nodes
205+
206+
If a project discovers zero tests, its root node will still appear in the Test Explorer as an empty folder. This ensures consistent behavior and makes it clear which projects were discovered, even if they have no tests yet.
207+
208+
### Logging prefix
209+
210+
All project-based testing logs use the `[test-by-project]` prefix for easy filtering in the output channel.
211+
212+
### Key files
213+
214+
- Python side:
215+
- `python_files/vscode_pytest/__init__.py` — `get_test_root_path()` function and `PROJECT_ROOT_PATH` environment variable for pytest.
216+
- `python_files/unittestadapter/discovery.py` — `discover_tests()` with `project_root_path` parameter and `PROJECT_ROOT_PATH` handling for unittest discovery.
217+
- `python_files/unittestadapter/execution.py` — `run_tests()` with `project_root_path` parameter and `PROJECT_ROOT_PATH` handling for unittest execution.
218+
- TypeScript: `testProjectRegistry.ts`, `projectAdapter.ts`, `projectUtils.ts`, and the discovery/execution adapters.
219+
220+
### Tests
221+
222+
- `src/test/testing/testController/common/testProjectRegistry.unit.test.ts` — TestProjectRegistry tests
223+
- `src/test/testing/testController/common/projectUtils.unit.test.ts` — Project utility function tests
224+
- `python_files/tests/pytestadapter/test_discovery.py` — pytest PROJECT_ROOT_PATH tests (see `test_project_root_path_env_var()` and `test_symlink_with_project_root_path()`)
225+
- `python_files/tests/unittestadapter/test_discovery.py` — unittest `project_root_path` / PROJECT_ROOT_PATH discovery tests
226+
- `python_files/tests/unittestadapter/test_execution.py` — unittest `project_root_path` / PROJECT_ROOT_PATH execution tests
227+
- `src/test/testing/testController/unittest/testDiscoveryAdapter.unit.test.ts` — unittest discovery adapter PROJECT_ROOT_PATH tests
228+
- `src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts` — unittest execution adapter PROJECT_ROOT_PATH tests
229+
154230
## Coverage support (how it works)
155231

156232
- Coverage is supported by running the Python helper scripts with coverage enabled and then collecting a coverage payload from the runner.

‎.github/workflows/pr-check.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,8 @@ jobs:
477477
### Coverage run
478478
coverage:
479479
name: Coverage
480+
# TEMPORARILY DISABLED - hanging in CI, needs investigation
481+
if: false
480482
# The value of runs-on is the OS of the current job (specified in the strategy matrix below) instead of being hardcoded.
481483
runs-on: ${{ matrix.os }}
482484
needs: [lint, check-types, python-tests, tests, native-tests]

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,5 @@ python_files/tests/*/.data/.coverage*
5454
python_files/tests/*/.data/*/.coverage*
5555
src/testTestingRootWkspc/coverageWorkspace/.coverage
5656

57+
# ignore ai artifacts generated and placed in this folder
58+
ai-artifacts/*

‎python_files/tests/pytestadapter/expected_discovery_test_output.py‎

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,3 +2013,214 @@
20132013
],
20142014
"id_": TEST_DATA_PATH_STR,
20152015
}
2016+
2017+
# =====================================================================================
2018+
# PROJECT_ROOT_PATH environment variable tests
2019+
# These test the project-based testing feature where PROJECT_ROOT_PATH changes
2020+
# the test tree root from cwd to the specified project path.
2021+
# =====================================================================================
2022+
2023+
# This is the expected output for unittest_folder when PROJECT_ROOT_PATH is set to unittest_folder.
2024+
# The root of the tree is unittest_folder (not .data), simulating project-based testing.
2025+
#
2026+
# **Project Configuration:**
2027+
# In the VS Code Python extension, projects are defined by the Python Environments extension.
2028+
# Each project has a root directory (identified by pyproject.toml, setup.py, etc.).
2029+
# When PROJECT_ROOT_PATH is set, pytest uses that path as the test tree root instead of cwd.
2030+
#
2031+
# **Test Tree Structure:**
2032+
# Without PROJECT_ROOT_PATH (legacy mode):
2033+
# └── .data (cwd = workspace root)
2034+
# └── unittest_folder
2035+
# └── test_add.py, test_subtract.py...
2036+
#
2037+
# With PROJECT_ROOT_PATH set to unittest_folder (project-based mode):
2038+
# └── unittest_folder (ROOT - set via PROJECT_ROOT_PATH env var)
2039+
# ├── test_add.py
2040+
# │ └── TestAddFunction
2041+
# │ ├── test_add_negative_numbers
2042+
# │ └── test_add_positive_numbers
2043+
# │ └── TestDuplicateFunction
2044+
# │ └── test_dup_a
2045+
# └── test_subtract.py
2046+
# └── TestSubtractFunction
2047+
# ├── test_subtract_negative_numbers
2048+
# └── test_subtract_positive_numbers
2049+
# └── TestDuplicateFunction
2050+
# └── test_dup_s
2051+
#
2052+
# Note: This reuses the unittest_folder paths defined earlier in this file.
2053+
project_root_unittest_folder_expected_output = {
2054+
"name": "unittest_folder",
2055+
"path": os.fspath(unittest_folder_path),
2056+
"type_": "folder",
2057+
"children": [
2058+
{
2059+
"name": "test_add.py",
2060+
"path": os.fspath(test_add_path),
2061+
"type_": "file",
2062+
"id_": os.fspath(test_add_path),
2063+
"children": [
2064+
{
2065+
"name": "TestAddFunction",
2066+
"path": os.fspath(test_add_path),
2067+
"type_": "class",
2068+
"children": [
2069+
{
2070+
"name": "test_add_negative_numbers",
2071+
"path": os.fspath(test_add_path),
2072+
"lineno": find_test_line_number(
2073+
"test_add_negative_numbers",
2074+
os.fspath(test_add_path),
2075+
),
2076+
"type_": "test",
2077+
"id_": get_absolute_test_id(
2078+
"test_add.py::TestAddFunction::test_add_negative_numbers",
2079+
test_add_path,
2080+
),
2081+
"runID": get_absolute_test_id(
2082+
"test_add.py::TestAddFunction::test_add_negative_numbers",
2083+
test_add_path,
2084+
),
2085+
},
2086+
{
2087+
"name": "test_add_positive_numbers",
2088+
"path": os.fspath(test_add_path),
2089+
"lineno": find_test_line_number(
2090+
"test_add_positive_numbers",
2091+
os.fspath(test_add_path),
2092+
),
2093+
"type_": "test",
2094+
"id_": get_absolute_test_id(
2095+
"test_add.py::TestAddFunction::test_add_positive_numbers",
2096+
test_add_path,
2097+
),
2098+
"runID": get_absolute_test_id(
2099+
"test_add.py::TestAddFunction::test_add_positive_numbers",
2100+
test_add_path,
2101+
),
2102+
},
2103+
],
2104+
"id_": get_absolute_test_id(
2105+
"test_add.py::TestAddFunction",
2106+
test_add_path,
2107+
),
2108+
"lineno": find_class_line_number("TestAddFunction", test_add_path),
2109+
},
2110+
{
2111+
"name": "TestDuplicateFunction",
2112+
"path": os.fspath(test_add_path),
2113+
"type_": "class",
2114+
"children": [
2115+
{
2116+
"name": "test_dup_a",
2117+
"path": os.fspath(test_add_path),
2118+
"lineno": find_test_line_number(
2119+
"test_dup_a",
2120+
os.fspath(test_add_path),
2121+
),
2122+
"type_": "test",
2123+
"id_": get_absolute_test_id(
2124+
"test_add.py::TestDuplicateFunction::test_dup_a",
2125+
test_add_path,
2126+
),
2127+
"runID": get_absolute_test_id(
2128+
"test_add.py::TestDuplicateFunction::test_dup_a",
2129+
test_add_path,
2130+
),
2131+
},
2132+
],
2133+
"id_": get_absolute_test_id(
2134+
"test_add.py::TestDuplicateFunction",
2135+
test_add_path,
2136+
),
2137+
"lineno": find_class_line_number("TestDuplicateFunction", test_add_path),
2138+
},
2139+
],
2140+
},
2141+
{
2142+
"name": "test_subtract.py",
2143+
"path": os.fspath(test_subtract_path),
2144+
"type_": "file",
2145+
"id_": os.fspath(test_subtract_path),
2146+
"children": [
2147+
{
2148+
"name": "TestSubtractFunction",
2149+
"path": os.fspath(test_subtract_path),
2150+
"type_": "class",
2151+
"children": [
2152+
{
2153+
"name": "test_subtract_negative_numbers",
2154+
"path": os.fspath(test_subtract_path),
2155+
"lineno": find_test_line_number(
2156+
"test_subtract_negative_numbers",
2157+
os.fspath(test_subtract_path),
2158+
),
2159+
"type_": "test",
2160+
"id_": get_absolute_test_id(
2161+
"test_subtract.py::TestSubtractFunction::test_subtract_negative_numbers",
2162+
test_subtract_path,
2163+
),
2164+
"runID": get_absolute_test_id(
2165+
"test_subtract.py::TestSubtractFunction::test_subtract_negative_numbers",
2166+
test_subtract_path,
2167+
),
2168+
},
2169+
{
2170+
"name": "test_subtract_positive_numbers",
2171+
"path": os.fspath(test_subtract_path),
2172+
"lineno": find_test_line_number(
2173+
"test_subtract_positive_numbers",
2174+
os.fspath(test_subtract_path),
2175+
),
2176+
"type_": "test",
2177+
"id_": get_absolute_test_id(
2178+
"test_subtract.py::TestSubtractFunction::test_subtract_positive_numbers",
2179+
test_subtract_path,
2180+
),
2181+
"runID": get_absolute_test_id(
2182+
"test_subtract.py::TestSubtractFunction::test_subtract_positive_numbers",
2183+
test_subtract_path,
2184+
),
2185+
},
2186+
],
2187+
"id_": get_absolute_test_id(
2188+
"test_subtract.py::TestSubtractFunction",
2189+
test_subtract_path,
2190+
),
2191+
"lineno": find_class_line_number("TestSubtractFunction", test_subtract_path),
2192+
},
2193+
{
2194+
"name": "TestDuplicateFunction",
2195+
"path": os.fspath(test_subtract_path),
2196+
"type_": "class",
2197+
"children": [
2198+
{
2199+
"name": "test_dup_s",
2200+
"path": os.fspath(test_subtract_path),
2201+
"lineno": find_test_line_number(
2202+
"test_dup_s",
2203+
os.fspath(test_subtract_path),
2204+
),
2205+
"type_": "test",
2206+
"id_": get_absolute_test_id(
2207+
"test_subtract.py::TestDuplicateFunction::test_dup_s",
2208+
test_subtract_path,
2209+
),
2210+
"runID": get_absolute_test_id(
2211+
"test_subtract.py::TestDuplicateFunction::test_dup_s",
2212+
test_subtract_path,
2213+
),
2214+
},
2215+
],
2216+
"id_": get_absolute_test_id(
2217+
"test_subtract.py::TestDuplicateFunction",
2218+
test_subtract_path,
2219+
),
2220+
"lineno": find_class_line_number("TestDuplicateFunction", test_subtract_path),
2221+
},
2222+
],
2223+
},
2224+
],
2225+
"id_": os.fspath(unittest_folder_path),
2226+
}

0 commit comments

Comments
 (0)