Fix test imports: inline helpers in test_app.py

Move sign_payload and make_webhook_body directly into test_app.py
to avoid conftest import issues in pytest collection.

Author: manascb1344

tests/conftest.py

@@ -1,38 +1,7 @@
-import hashlib
-import hmac
-import json
-
 import pytest
 
 
 @pytest.fixture(autouse=True)
 def set_env(monkeypatch):
     monkeypatch.setenv("WEBHOOK_SECRET", "test-secret")
     monkeypatch.setenv("GITHUB_TOKEN", "ghp_test_token")
-
-
-@pytest.fixture
-def webhook_secret():
-    return "test-secret"
-
-
-def sign_payload(body: bytes, secret: str = "test-secret") -> str:
-    return "sha256=" + hmac.new(secret.encode(), body, digestmod=hashlib.sha256).hexdigest()
-
-
-def make_webhook_body(
-    action="queued",
-    job_id=12345,
-    labels=None,
-    repo_url="https://github.com/owner/repo",
-    repo_full_name="owner/repo",
-):
-    if labels is None:
-        labels = ["self-hosted", "modal"]
-    return json.dumps(
-        {
-            "action": action,
-            "workflow_job": {"id": job_id, "labels": labels},
-            "repository": {"url": repo_url, "full_name": repo_full_name},
-        }
-    ).encode()

tests/test_app.py

@@ -1,9 +1,43 @@
+import hashlib
+import hmac
 import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import httpx
 import pytest
-from conftest import make_webhook_body, sign_payload
+
+
+def _sign(body: bytes, secret: str = "test-secret") -> str:
+    return "sha256=" + hmac.new(secret.encode(), body, digestmod=hashlib.sha256).hexdigest()
+
+
+def _make_request(body: bytes, secret: str = "test-secret", delivery_id: str = "test-delivery-123"):
+    request = MagicMock()
+    request.headers = {
+        "Content-Type": "application/json",
+        "X-Hub-Signature-256": _sign(body, secret),
+        "X-GitHub-Delivery": delivery_id,
+    }
+    request.body = AsyncMock(return_value=body)
+    return request
+
+
+def _make_webhook_body(
+    action="queued",
+    job_id=12345,
+    labels=None,
+    repo_url="https://github.com/owner/repo",
+    repo_full_name="owner/repo",
+):
+    if labels is None:
+        labels = ["self-hosted", "modal"]
+    return json.dumps(
+        {
+            "action": action,
+            "workflow_job": {"id": job_id, "labels": labels},
+            "repository": {"url": repo_url, "full_name": repo_full_name},
+        }
+    ).encode()
 
 # =============================================================================
 # _call_github_api retry tests
@@ -144,17 +178,6 @@ async def test_call_github_api_exhausts_retries():
 # =============================================================================
 
 
-def _make_request(body: bytes, secret: str = "test-secret", delivery_id: str = "test-delivery-123"):
-    request = MagicMock()
-    request.headers = {
-        "Content-Type": "application/json",
-        "X-Hub-Signature-256": sign_payload(body, secret),
-        "X-GitHub-Delivery": delivery_id,
-    }
-    request.body = AsyncMock(return_value=body)
-    return request
-
-
 @pytest.mark.asyncio
 async def test_verify_signature_valid():
     from app import verify_signature
@@ -299,7 +322,7 @@ async def test_webhook_missing_labels(_mock_modal_obj):
 async def test_webhook_ignores_non_modal_labels(_mock_modal_obj):
     from app import github_webhook
 
-    body = make_webhook_body(labels=["self-hosted", "ubuntu"])
+    body = _make_webhook_body(labels=["self-hosted", "ubuntu"])
     request = _make_request(body)
 
     result = await github_webhook(request)
@@ -312,7 +335,7 @@ async def test_webhook_ignores_non_modal_labels(_mock_modal_obj):
 async def test_webhook_ignores_non_queued_action(_mock_modal_obj):
     from app import github_webhook
 
-    body = make_webhook_body(action="started")
+    body = _make_webhook_body(action="started")
     request = _make_request(body)
 
     result = await github_webhook(request)
@@ -342,7 +365,7 @@ async def test_webhook_rejects_invalid_repo_url(_mock_modal_obj):
 
     from app import github_webhook
 
-    body = make_webhook_body(repo_url="https://evil.com/fake")
+    body = _make_webhook_body(repo_url="https://evil.com/fake")
     request = _make_request(body)
 
     with pytest.raises(HTTPException) as exc_info: