pytest-isolated 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

pytest_isolated/__init__.py

@@ -1,3 +1,3 @@
 """pytest-isolated: Run pytest tests in isolated subprocesses."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

pytest_isolated/plugin.py

@@ -6,6 +6,7 @@ import os
 import subprocess
 import sys
 import tempfile
+import time
 from collections import OrderedDict
 from pathlib import Path
 from typing import Any
@@ -21,27 +22,27 @@ SUBPROC_REPORT_PATH = "PYTEST_SUBPROCESS_REPORT_PATH"
 
 def pytest_addoption(parser: pytest.Parser) -> None:
     """Add configuration options for subprocess isolation."""
-    group = parser.getgroup("subprocess")
+    group = parser.getgroup("isolated")
     group.addoption(
-        "--subprocess-timeout",
+        "--isolated-timeout",
         type=int,
         default=None,
-        help="Timeout in seconds for subprocess groups (default: 300)",
+        help="Timeout in seconds for isolated test groups (default: 300)",
     )
     group.addoption(
-        "--no-subprocess",
+        "--no-isolation",
         action="store_true",
         default=False,
         help="Disable subprocess isolation (for debugging)",
     )
     parser.addini(
-        "subprocess_timeout",
+        "isolated_timeout",
         type="string",
         default="300",
-        help="Default timeout in seconds for subprocess groups",
+        help="Default timeout in seconds for isolated test groups",
     )
     parser.addini(
-        "subprocess_capture_passed",
+        "isolated_capture_passed",
         type="bool",
         default=False,
         help="Capture output for passed tests (default: False)",
@@ -51,8 +52,9 @@ def pytest_addoption(parser: pytest.Parser) -> None:
 def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line(
         "markers",
-        "subprocess(group=None): run this test in a grouped fresh Python subprocess; "
-        "tests with the same group run together in one subprocess.",
+        "isolated(group=None, timeout=None): run this test in a grouped "
+        "fresh Python subprocess; tests with the same group run together in "
+        "one subprocess. timeout (seconds) overrides global --isolated-timeout.",
     )
 
 
@@ -100,17 +102,18 @@ def pytest_collection_modifyitems(
     if os.environ.get(SUBPROC_ENV) == "1":
         return  # child should not do grouping
 
-    # If --no-subprocess is set, treat all tests as normal (no subprocess isolation)
-    if config.getoption("no_subprocess", False):
+    # If --no-isolation is set, treat all tests as normal (no subprocess isolation)
+    if config.getoption("no_isolation", False):
         config._subprocess_groups = OrderedDict()  # type: ignore[attr-defined]
         config._subprocess_normal_items = items  # type: ignore[attr-defined]
         return
 
     groups: OrderedDict[str, list[pytest.Item]] = OrderedDict()
+    group_timeouts: dict[str, int | None] = {}  # Track timeout per group
     normal: list[pytest.Item] = []
 
     for item in items:
-        m = item.get_closest_marker("subprocess")
+        m = item.get_closest_marker("isolated")
         if not m:
             normal.append(item)
             continue
@@ -119,9 +122,16 @@ def pytest_collection_modifyitems(
         # Default grouping to module path (so you don't accidentally group everything)
         if group is None:
             group = item.nodeid.split("::")[0]
-        groups.setdefault(str(group), []).append(item)
+
+        # Store group-specific timeout (first marker wins)
+        group_key = str(group)
+        if group_key not in group_timeouts:
+            group_timeouts[group_key] = m.kwargs.get("timeout")
+
+        groups.setdefault(group_key, []).append(item)
 
     config._subprocess_groups = groups  # type: ignore[attr-defined]
+    config._subprocess_group_timeouts = group_timeouts  # type: ignore[attr-defined]
     config._subprocess_normal_items = normal  # type: ignore[attr-defined]
 
 
@@ -143,17 +153,20 @@ def pytest_runtestloop(session: pytest.Session) -> int | None:
     groups: OrderedDict[str, list[pytest.Item]] = getattr(
         config, "_subprocess_groups", OrderedDict()
     )
+    group_timeouts: dict[str, int | None] = getattr(
+        config, "_subprocess_group_timeouts", {}
+    )
     normal_items: list[pytest.Item] = getattr(
         config, "_subprocess_normal_items", session.items
     )
 
-    # Get timeout configuration
-    timeout_opt = config.getoption("subprocess_timeout", None)
-    timeout_ini = config.getini("subprocess_timeout")
-    timeout = timeout_opt or (int(timeout_ini) if timeout_ini else 300)
+    # Get default timeout configuration
+    timeout_opt = config.getoption("isolated_timeout", None)
+    timeout_ini = config.getini("isolated_timeout")
+    default_timeout = timeout_opt or (int(timeout_ini) if timeout_ini else 300)
 
     # Get capture configuration
-    capture_passed = config.getini("subprocess_capture_passed")
+    capture_passed = config.getini("isolated_capture_passed")
 
     def emit_report(
         item: pytest.Item,
@@ -205,6 +218,9 @@ def pytest_runtestloop(session: pytest.Session) -> int | None:
     for group_name, group_items in groups.items():
         nodeids = [it.nodeid for it in group_items]
 
+        # Get timeout for this group (marker timeout > global timeout)
+        group_timeout = group_timeouts.get(group_name) or default_timeout
+
         # file where the child will append JSONL records
         with tempfile.NamedTemporaryFile(
             prefix="pytest-subproc-", suffix=".jsonl", delete=False
@@ -215,12 +231,13 @@ def pytest_runtestloop(session: pytest.Session) -> int | None:
         env[SUBPROC_ENV] = "1"
         env[SUBPROC_REPORT_PATH] = report_path
 
-        # Run pytest in subprocess with timeout
+        # Run pytest in subprocess with timeout, tracking execution time
         cmd = [sys.executable, "-m", "pytest", *nodeids]
+        start_time = time.time()
 
         try:
             proc = subprocess.run(
-                cmd, env=env, timeout=timeout, capture_output=False, check=False
+                cmd, env=env, timeout=group_timeout, capture_output=False, check=False
             )
             returncode = proc.returncode
             timed_out = False
@@ -228,6 +245,8 @@ def pytest_runtestloop(session: pytest.Session) -> int | None:
             returncode = -1
             timed_out = True
 
+        execution_time = time.time() - start_time
+
         # Gather results from JSONL file
         results: dict[str, dict[str, Any]] = {}
         report_file = Path(report_path)
@@ -250,9 +269,10 @@ def pytest_runtestloop(session: pytest.Session) -> int | None:
         # Handle timeout or crash
         if timed_out:
             msg = (
-                f"Subprocess group={group_name!r} timed out after {timeout} "
-                f"seconds. Increase timeout with --subprocess-timeout or "
-                f"subprocess_timeout ini option."
+                f"Subprocess group={group_name!r} timed out after {group_timeout} "
+                f"seconds (execution time: {execution_time:.2f}s). "
+                f"Increase timeout with --isolated-timeout, isolated_timeout ini, "
+                f"or @pytest.mark.isolated(timeout=N)."
             )
             for it in group_items:
                 emit_report(it, "call", "failed", longrepr=msg)

{pytest_isolated-0.1.0.dist-info → pytest_isolated-0.2.0.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: pytest-isolated
-Version: 0.1.0
+Version: 0.2.0
 Summary: Run marked pytest tests in grouped subprocesses (cross-platform).
 Author: pytest-isolated contributors
-License: MIT
+License-Expression: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
@@ -27,6 +26,9 @@ Dynamic: license-file
 
 # pytest-isolated
 
+[![Tests](https://github.com/dyollb/pytest-isolated/actions/workflows/test.yml/badge.svg)](https://github.com/dyollb/pytest-isolated/actions/workflows/test.yml)
+[![PyPI](https://img.shields.io/pypi/v/pytest-isolated.svg)](https://pypi.org/project/pytest-isolated/)
+
 A pytest plugin that runs marked tests in isolated subprocesses with intelligent grouping.
 
 ## Features
@@ -52,7 +54,7 @@ Mark tests to run in isolated subprocesses:
 ```python
 import pytest
 
-@pytest.mark.subprocess
+@pytest.mark.isolated
 def test_isolated():
     # Runs in a fresh subprocess
     assert True
@@ -61,16 +63,25 @@ def test_isolated():
 Tests with the same group run together in one subprocess:
 
 ```python
-@pytest.mark.subprocess(group="mygroup")
+@pytest.mark.isolated(group="mygroup")
 def test_one():
     shared_state.append(1)
 
-@pytest.mark.subprocess(group="mygroup")
+@pytest.mark.isolated(group="mygroup")
 def test_two():
     # Sees state from test_one
     assert len(shared_state) == 2
 ```
 
+Set timeout per test group:
+
+```python
+@pytest.mark.isolated(timeout=30)
+def test_with_timeout():
+    # This group gets 30 second timeout (overrides global setting)
+    expensive_operation()
+```
+
 Tests without an explicit group are automatically grouped by module.
 
 ## Configuration
@@ -78,30 +89,30 @@ Tests without an explicit group are automatically grouped by module.
 ### Command Line
 
 ```bash
-# Set subprocess timeout (seconds)
-pytest --subprocess-timeout=60
+# Set isolated test timeout (seconds)
+pytest --isolated-timeout=60
 
 # Disable subprocess isolation for debugging
-pytest --no-subprocess
+pytest --no-isolation
 
 # Combine with pytest debugger
-pytest --no-subprocess --pdb
+pytest --no-isolation --pdb
 ```
 
 ### pytest.ini / pyproject.toml
 
 ```ini
 [pytest]
-subprocess_timeout = 300
-subprocess_capture_passed = false
+isolated_timeout = 300
+isolated_capture_passed = false
 ```
 
 Or in `pyproject.toml`:
 
 ```toml
 [tool.pytest.ini_options]
-subprocess_timeout = "300"
-subprocess_capture_passed = false
+isolated_timeout = "300"
+isolated_capture_passed = false
 ```
 
 ## Use Cases
@@ -109,13 +120,13 @@ subprocess_capture_passed = false
 ### Testing Global State
 
 ```python
-@pytest.mark.subprocess
+@pytest.mark.isolated
 def test_modifies_environ():
     import os
     os.environ["MY_VAR"] = "value"
     # Won't affect other tests
 
-@pytest.mark.subprocess
+@pytest.mark.isolated
 def test_clean_environ():
     import os
     assert "MY_VAR" not in os.environ
@@ -124,13 +135,13 @@ def test_clean_environ():
 ### Testing Singletons
 
 ```python
-@pytest.mark.subprocess(group="singleton_tests")
+@pytest.mark.isolated(group="singleton_tests")
 def test_singleton_init():
     from myapp import DatabaseConnection
     db = DatabaseConnection.get_instance()
     assert db is not None
 
-@pytest.mark.subprocess(group="singleton_tests")
+@pytest.mark.isolated(group="singleton_tests")
 def test_singleton_reuse():
     db = DatabaseConnection.get_instance()
     # Same instance as previous test in group
@@ -139,7 +150,7 @@ def test_singleton_reuse():
 ### Testing Process Resources
 
 ```python
-@pytest.mark.subprocess
+@pytest.mark.isolated
 def test_signal_handlers():
     import signal
     signal.signal(signal.SIGTERM, custom_handler)
@@ -151,7 +162,7 @@ def test_signal_handlers():
 Failed tests automatically capture and display stdout/stderr:
 
 ```python
-@pytest.mark.subprocess
+@pytest.mark.isolated
 def test_failing():
     print("Debug info")
     assert False
@@ -167,7 +178,7 @@ pytest --junitxml=report.xml --durations=10
 
 **Fixtures**: Module/session fixtures run in each subprocess group. Cannot share fixture objects between parent and subprocess.
 
-**Debugging**: Use `--no-subprocess` to run all tests in the main process for easier debugging with `pdb` or IDE debuggers.
+**Debugging**: Use `--no-isolation` to run all tests in the main process for easier debugging with `pdb` or IDE debuggers.
 
 **Performance**: Subprocess creation adds ~100-500ms per group. Group related tests to minimize overhead.
 
@@ -176,7 +187,7 @@ pytest --junitxml=report.xml --durations=10
 ### Timeout Handling
 
 ```bash
-pytest --subprocess-timeout=30
+pytest --isolated-timeout=30
 ```
 
 Timeout errors are clearly reported with the group name and timeout duration.
@@ -197,24 +208,18 @@ if os.environ.get("PYTEST_RUNNING_IN_SUBPROCESS") == "1":
 
 ## Troubleshooting
 
-**Tests timing out**: Increase timeout with `--subprocess-timeout=600`
+**Tests timing out**: Increase timeout with `--isolated-timeout=600`
 
-**Missing output**: Enable capture for passed tests with `subprocess_capture_passed = true`
+**Missing output**: Enable capture for passed tests with `isolated_capture_passed = true`
 
 **Subprocess crashes**: Check for segfaults, OOM, or signal issues. Run with `-v` for details.
 
-## License
-
-MIT License - see LICENSE file for details.
+## Contributing
 
-## Changelog
+1. Install pre-commit: `pip install pre-commit && pre-commit install`
+1. Run tests: `pytest tests/ -v`
+1. Open an issue before submitting PRs for new features
 
-### 0.1.0 (2026-01-12)
+## License
 
-- Initial release
-- Process isolation with subprocess marker
-- Smart grouping by module or explicit group names
-- Timeout support
-- Complete test phase capture (setup/call/teardown)
-- JUnit XML and standard reporter integration
-- Comprehensive error handling and reporting
+MIT License - see LICENSE file for details.

pytest_isolated-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+pytest_isolated/__init__.py,sha256=PN_IEdfxCUz6vL1vf0Ka9CGmCq9ppFk33fVGirSVtMc,89
+pytest_isolated/plugin.py,sha256=0AKRTWmdLaiwZdwRicRd3TMLrIeisGBMlFqCDOnJRX0,12206
+pytest_isolated/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_isolated-0.2.0.dist-info/licenses/LICENSE,sha256=WECJyowi685PZSnKcA4Tqs7jukfzbnk7iMPLnm_q4JI,1067
+pytest_isolated-0.2.0.dist-info/METADATA,sha256=q_E02kvtbnt1QgQc-ATrghLcJka7Y_2Zx50tmatVGCM,5384
+pytest_isolated-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_isolated-0.2.0.dist-info/entry_points.txt,sha256=HgRNPjIGoPBF1pkhma4UtaSwhpOVB8oZRZ0L1FcZXgk,45
+pytest_isolated-0.2.0.dist-info/top_level.txt,sha256=FAtpozhvI-YaiFoZMepi9JAm6e87mW-TM1Ovu5xLOxg,16
+pytest_isolated-0.2.0.dist-info/RECORD,,

pytest_isolated-0.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pytest_isolated/__init__.py,sha256=iqPlqv1sT1c10XcWOeYbJyRyIzeQk0Sa-OhOS14IMfg,89
-pytest_isolated/plugin.py,sha256=lLNjY5Jm5SmllySvVPRCF87fpQTnRx_RMtloKeM1m9U,11296
-pytest_isolated-0.1.0.dist-info/licenses/LICENSE,sha256=WECJyowi685PZSnKcA4Tqs7jukfzbnk7iMPLnm_q4JI,1067
-pytest_isolated-0.1.0.dist-info/METADATA,sha256=qfVoG6VGZCb-Dj5Wl12sGQH7WO-U2Gj4KcGV2H_FXzU,5131
-pytest_isolated-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_isolated-0.1.0.dist-info/entry_points.txt,sha256=HgRNPjIGoPBF1pkhma4UtaSwhpOVB8oZRZ0L1FcZXgk,45
-pytest_isolated-0.1.0.dist-info/top_level.txt,sha256=FAtpozhvI-YaiFoZMepi9JAm6e87mW-TM1Ovu5xLOxg,16
-pytest_isolated-0.1.0.dist-info/RECORD,,