undo handling individual tests

Author: hussain-jafari

tests/integration/release/conftest.py

@@ -96,10 +96,8 @@ def pytest_addoption(parser: pytest.Parser) -> None:
 # Fixtures #
 ############
 @pytest.fixture(scope="session")
-def release_output_dir() -> Path | None:
-    output_dir_name = request.config.getoption("--output-dir", default=None)
-    if not output_dir_name:
-        return None
+def release_output_dir(request: pytest.FixtureRequest) -> Path | None:
+    output_dir_name = request.config.getoption("--output-dir", default=CLI_DEFAULT_OUTPUT_DIR)
     output_dir = Path(output_dir_name) / f"{time.strftime('%Y%m%d_%H%M%S')}"
     output_dir.mkdir(parents=True, exist_ok=False)
     return output_dir.resolve()
@@ -135,8 +133,8 @@ def dataset_params(
 
 @pytest.fixture(scope="session")
 def noised_data(
-    release_output_dir: Path,
     dataset_params: tuple[str | int | Callable[..., pd.DataFrame] | None, ...],
+    release_output_dir: Path,
     request: pytest.FixtureRequest,
     config: dict[str, Any],
 ) -> pd.DataFrame:

tests/integration/release/test_release.py

@@ -40,7 +40,6 @@ def test_row_noising_omit_row_or_do_not_respond(
     noised_data: pd.DataFrame,
     dataset_name: str,
     config: dict[str, Any],
-    request: FixtureRequest,
 ) -> None:
     """Tests that omit_row and do_not_respond row noising are being applied"""
     idx_cols = IDX_COLS.get(dataset_name)

tests/integration/release/test_runner.py

@@ -22,15 +22,13 @@
     ids=["1", "2", "3", "4"],
 )
 def test_release_tests(pytest_args: list[str], release_output_dir: Path, request: pytest.FixtureRequest) -> None:
-    if release_output_dir is None:
-        release_output_dir = Path(CLI_DEFAULT_OUTPUT_DIR) / f"{time.strftime('%Y%m%d_%H%M%S')}"
     os.chdir(Path(__file__).parent)  # need this to access cli options from conftest.py
     base_cmd = [
         "pytest",
         "--release",
         "test_release.py",
         "--check-max-tb=1000",
-        f"--output-dir=={release_output_dir}"
+        f"--output-dir={release_output_dir}"
     ]
     cmd = base_cmd + pytest_args