Add another fixture to consolidate multi-package installs

Signed-off-by: Cristian Le <[email protected]>

Author: LecrisUT

tests/conftest.py

@@ -8,6 +8,7 @@
 import subprocess
 import sys
 import sysconfig
+from collections.abc import Iterable
 from importlib import metadata
 from pathlib import Path
 from typing import Any, Literal, overload
@@ -207,9 +208,12 @@ def source_date_epoch(self) -> str:
 
 
 def process_package(
-    package: PackageInfo, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    package: PackageInfo,
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    pkg_path: str = "pkg",
 ) -> None:
-    package_dir = tmp_path / "pkg"
+    package_dir = tmp_path / pkg_path
     shutil.copytree(DIR / "packages" / package.name, package_dir)
     monkeypatch.chdir(package_dir)
 
@@ -226,6 +230,22 @@ def package(
     return package
 
 
+@pytest.fixture
+def multiple_packages(
+    request: pytest.FixtureRequest, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> list[PackageInfo]:
+    package_names = request.param
+    assert isinstance(package_names, Iterable)
+    packages = []
+    for pkg_name in package_names:
+        pkg = PackageInfo(pkg_name)
+        assert (DIR / "packages" / pkg.name).exists()
+        process_package(pkg, tmp_path, monkeypatch, pkg_path=pkg.name)
+        packages.append(pkg)
+    monkeypatch.chdir(tmp_path)
+    return packages
+
+
 @pytest.fixture
 def package_simple_pyproject_ext(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch

tests/test_editable.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 import pytest
-from conftest import PackageInfo, process_package
 
 
 @pytest.mark.compile
@@ -54,36 +53,22 @@ def test_navigate_editable(isolated, isolate, py_pkg):
 @pytest.mark.configure
 @pytest.mark.integration
 @pytest.mark.parametrize("isolate", {False}, indirect=True)
-def test_cython_pxd(monkeypatch, tmp_path, editable, isolated, isolate):
+@pytest.mark.parametrize(
+    "multiple_packages",
+    [["cython_pxd_editable/pkg1", "cython_pxd_editable/pkg2"]],
+    indirect=True,
+)
+def test_cython_pxd(multiple_packages, editable, isolated, isolate):
     isolated.install("cython")
 
-    package1 = PackageInfo(
-        "cython_pxd_editable/pkg1",
-    )
-    tmp_path1 = tmp_path / "pkg1"
-    tmp_path1.mkdir()
-    process_package(package1, tmp_path1, monkeypatch)
-
-    isolated.install(
-        "-v",
-        *isolate.flags,
-        *editable.flags,
-        ".",
-    )
-
-    package2 = PackageInfo(
-        "cython_pxd_editable/pkg2",
-    )
-    tmp_path2 = tmp_path / "pkg2"
-    tmp_path2.mkdir()
-    process_package(package2, tmp_path2, monkeypatch)
-
-    isolated.install(
-        "-v",
-        *isolate.flags,
-        *editable.flags,
-        ".",
-    )
+    # install the packages in order with one dependent on the other
+    for package in multiple_packages:
+        isolated.install(
+            "-v",
+            *isolate.flags,
+            *editable.flags,
+            package.name,
+        )
 
 
 @pytest.mark.compile