Skip to content

Commit e10584a

Browse files
committed
fix: remove indirect parametrization from a few sub fixtures of robust_demo and ensure its name changes as needed based on permutations
1 parent 0f2dfb8 commit e10584a

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

tests/conftest.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def robust_file__path__relative(request: FixtureRequest) -> str:
5151

5252
@pytest.fixture(scope="session")
5353
def robust_demo(
54-
request: FixtureRequest,
5554
demos_folder: Path,
5655
robust_demo__path: Path,
5756
robust_demo__extra_context: dict[str, Any],
@@ -67,29 +66,29 @@ def robust_demo(
6766
if robust_demo__is_setup:
6867
subprocess.run(["nox", "-s", "setup-git"], cwd=robust_demo__path, capture_output=True)
6968
subprocess.run(["nox", "-s", "setup-venv"], cwd=robust_demo__path, capture_output=True)
70-
return getattr(request, "param", robust_demo__path)
69+
return robust_demo__path
7170

7271

7372
@pytest.fixture(scope="session")
74-
def robust_demo__path(request: FixtureRequest, demos_folder: Path, robust_demo__name: str) -> Path:
75-
return getattr(request, "param", demos_folder / robust_demo__name)
73+
def robust_demo__path(demos_folder: Path, robust_demo__name: str) -> Path:
74+
return demos_folder / robust_demo__name
7675

7776

7877
@pytest.fixture(scope="session")
79-
def robust_demo__name(request: FixtureRequest) -> str:
80-
return getattr(request, "param", "robust-python-demo-with-setup")
78+
def robust_demo__name(robust_demo__add_rust_extension: str, robust_demo__is_setup: bool) -> str:
79+
build: str = "maturin" if robust_demo__add_rust_extension else "python"
80+
name_parts: list[str] = ["robust", "python", "demo", build]
81+
if robust_demo__is_setup:
82+
name_parts.append("setup")
83+
return "-".join(name_parts)
8184

8285

8386
@pytest.fixture(scope="session")
84-
def robust_demo__extra_context(
85-
request: FixtureRequest,
86-
robust_demo__name: str,
87-
robust_demo__add_rust_extension: bool
88-
) -> dict[str, Any]:
89-
return getattr(request, "param", {
87+
def robust_demo__extra_context(robust_demo__name: str, robust_demo__add_rust_extension: bool) -> dict[str, Any]:
88+
return {
9089
"project_name": robust_demo__name,
9190
"add_rust_extension": robust_demo__add_rust_extension
92-
})
91+
}
9392

9493

9594
@pytest.fixture(scope="session")

0 commit comments

Comments
 (0)