pytest-neon 2.1.0__tar.gz → 2.1.1__tar.gz

{pytest_neon-2.1.0 → pytest_neon-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-neon
-Version: 2.1.0
+Version: 2.1.1
 Summary: Pytest plugin for Neon database branch isolation in tests
 Project-URL: Homepage, https://github.com/ZainRizvi/pytest-neon
 Project-URL: Repository, https://github.com/ZainRizvi/pytest-neon

{pytest_neon-2.1.0 → pytest_neon-2.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pytest-neon"
-version = "2.1.0"
+version = "2.1.1"
 description = "Pytest plugin for Neon database branch isolation in tests"
 readme = "README.md"
 license = "MIT"

{pytest_neon-2.1.0 → pytest_neon-2.1.1}/src/pytest_neon/__init__.py

@@ -9,7 +9,7 @@ from pytest_neon.plugin import (
     neon_engine,
 )
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 __all__ = [
     "NeonBranch",
     "neon_branch",

{pytest_neon-2.1.0 → pytest_neon-2.1.1}/src/pytest_neon/plugin.py

@@ -396,7 +396,8 @@ def _reset_branch_to_parent(
     """Reset a branch to its parent's state using the Neon API.
 
     Uses exponential backoff retry logic to handle transient API errors
-    that can occur during parallel test execution.
+    that can occur during parallel test execution. After initiating the
+    restore, polls the operation status until it completes.
 
     Args:
         branch: The branch to reset
@@ -406,7 +407,10 @@ def _reset_branch_to_parent(
     if not branch.parent_id:
         raise RuntimeError(f"Branch {branch.branch_id} has no parent - cannot reset")
 
-    url = f"https://console.neon.tech/api/v2/projects/{branch.project_id}/branches/{branch.branch_id}/restore"
+    base_url = "https://console.neon.tech/api/v2"
+    project_id = branch.project_id
+    branch_id = branch.branch_id
+    restore_url = f"{base_url}/projects/{project_id}/branches/{branch_id}/restore"
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json",
@@ -416,12 +420,27 @@ def _reset_branch_to_parent(
     for attempt in range(max_retries + 1):
         try:
             response = requests.post(
-                url,
+                restore_url,
                 headers=headers,
                 json={"source_branch_id": branch.parent_id},
                 timeout=30,
             )
             response.raise_for_status()
+
+            # The restore API returns operations that run asynchronously.
+            # We must wait for operations to complete before the next test
+            # starts, otherwise connections may fail during the restore.
+            data = response.json()
+            operations = data.get("operations", [])
+
+            if operations:
+                _wait_for_operations(
+                    project_id=branch.project_id,
+                    operations=operations,
+                    headers=headers,
+                    base_url=base_url,
+                )
+
             return  # Success
         except requests.RequestException as e:
             last_error = e
@@ -434,6 +453,64 @@ def _reset_branch_to_parent(
     raise last_error  # type: ignore[misc]
 
 
+def _wait_for_operations(
+    project_id: str,
+    operations: list[dict[str, Any]],
+    headers: dict[str, str],
+    base_url: str,
+    max_wait_seconds: float = 60,
+    poll_interval: float = 0.5,
+) -> None:
+    """Wait for Neon operations to complete.
+
+    Args:
+        project_id: The Neon project ID
+        operations: List of operation dicts from the API response
+        headers: HTTP headers including auth
+        base_url: Base URL for Neon API
+        max_wait_seconds: Maximum time to wait (default: 60s)
+        poll_interval: Time between polls (default: 0.5s)
+    """
+    # Get operation IDs that aren't already finished
+    pending_op_ids = [
+        op["id"] for op in operations if op.get("status") not in ("finished", "skipped")
+    ]
+
+    if not pending_op_ids:
+        return  # All operations already complete
+
+    waited = 0.0
+    while pending_op_ids and waited < max_wait_seconds:
+        time.sleep(poll_interval)
+        waited += poll_interval
+
+        # Check status of each pending operation
+        still_pending = []
+        for op_id in pending_op_ids:
+            op_url = f"{base_url}/projects/{project_id}/operations/{op_id}"
+            try:
+                response = requests.get(op_url, headers=headers, timeout=10)
+                response.raise_for_status()
+                op_data = response.json().get("operation", {})
+                status = op_data.get("status")
+
+                if status == "error":
+                    err = op_data.get("error", "unknown error")
+                    raise RuntimeError(f"Operation {op_id} failed: {err}")
+                if status not in ("finished", "skipped"):
+                    still_pending.append(op_id)
+            except requests.RequestException:
+                # On network error, assume still pending and retry
+                still_pending.append(op_id)
+
+        pending_op_ids = still_pending
+
+    if pending_op_ids:
+        raise RuntimeError(
+            f"Timeout waiting for operations to complete: {pending_op_ids}"
+        )
+
+
 @pytest.fixture(scope="session")
 def _neon_migration_branch(
     request: pytest.FixtureRequest,

{pytest_neon-2.1.0 → pytest_neon-2.1.1}/tests/test_reset_behavior.py

@@ -21,6 +21,8 @@ class TestResetRetryBehavior:
         # Mock requests.post to fail twice, then succeed
         mock_response = mocker.Mock()
         mock_response.raise_for_status = mocker.Mock()
+        # Return empty operations list (already complete)
+        mock_response.json.return_value = {"operations": []}
 
         import requests
 
@@ -103,6 +105,8 @@ class TestResetRetryBehavior:
 
         mock_response = mocker.Mock()
         mock_response.raise_for_status = mocker.Mock()
+        # Return empty operations list (already complete)
+        mock_response.json.return_value = {"operations": []}
         mock_post = mocker.patch(
             "pytest_neon.plugin.requests.post", return_value=mock_response
         )
@@ -113,6 +117,51 @@ class TestResetRetryBehavior:
         assert mock_post.call_count == 1
         assert mock_sleep.call_count == 0
 
+    def test_reset_waits_for_operations_to_complete(self, mocker):
+        """Verify reset polls operation status until complete."""
+        branch = NeonBranch(
+            branch_id="br-test",
+            project_id="proj-test",
+            connection_string="postgresql://test",
+            host="test.neon.tech",
+            parent_id="br-parent",
+        )
+
+        # Mock POST response with pending operation
+        mock_post_response = mocker.Mock()
+        mock_post_response.raise_for_status = mocker.Mock()
+        mock_post_response.json.return_value = {
+            "operations": [{"id": "op-123", "status": "running"}]
+        }
+
+        # Mock GET responses: first running, then finished
+        get_call_count = [0]
+
+        def mock_get(*args, **kwargs):
+            get_call_count[0] += 1
+            mock_get_response = mocker.Mock()
+            mock_get_response.raise_for_status = mocker.Mock()
+            if get_call_count[0] < 3:
+                mock_get_response.json.return_value = {
+                    "operation": {"id": "op-123", "status": "running"}
+                }
+            else:
+                mock_get_response.json.return_value = {
+                    "operation": {"id": "op-123", "status": "finished"}
+                }
+            return mock_get_response
+
+        mocker.patch(
+            "pytest_neon.plugin.requests.post", return_value=mock_post_response
+        )
+        mocker.patch("pytest_neon.plugin.requests.get", side_effect=mock_get)
+        mocker.patch("pytest_neon.plugin.time.sleep")
+
+        _reset_branch_to_parent(branch, "fake-api-key")
+
+        # Should have polled until finished
+        assert get_call_count[0] == 3
+
 
 class TestResetBehavior:
     """Test that branch reset happens between tests."""