From b72514bb32c46fffb8543f497351b53ba8416c2b Mon Sep 17 00:00:00 2001
From: Chris Coutinho <chris@coutinho.io>
Date: Sun, 19 Oct 2025 00:27:19 +0200
Subject: [PATCH] ci: Add pytest-timeout to dev deps

---
 pyproject.toml    |  4 ++++
 tests/conftest.py | 10 ++++++++--
 uv.lock           | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index d099b79..74c60bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,6 +29,9 @@ markers = [
 testpaths = [
     "tests",
 ]
+# Timeout settings to prevent tests from hanging indefinitely
+timeout = 180  # 3 minutes default timeout per test (includes fixture setup)
+timeout_func_only = false  # Timeout includes fixture setup/teardown
 
 [tool.commitizen]
 name = "cz_conventional_commits"
@@ -53,6 +56,7 @@ dev = [
     "pytest>=8.3.5",
     "pytest-cov>=6.1.1",
     "pytest-playwright-asyncio>=0.7.1",
+    "pytest-timeout>=2.3.1",
     "ruff>=0.11.13",
 ]
 
diff --git a/tests/conftest.py b/tests/conftest.py
index add70d7..7fe972e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -552,6 +552,13 @@ def oauth_callback_server():
 
     Automatically skips when running in GitHub Actions CI.
     """
+    # Skip OAuth tests in GitHub Actions - Playwright browser automation
+    # has issues with localhost callback server in CI environment
+    if os.getenv("GITHUB_ACTIONS"):
+        pytest.skip(
+            "OAuth tests with browser automation not supported in GitHub Actions CI"
+        )
+
     import threading
     from http.server import BaseHTTPRequestHandler, HTTPServer
     from urllib.parse import parse_qs, urlparse
@@ -1135,9 +1142,8 @@ async def all_oauth_tokens(
         )
 
     # Create tasks for all users with staggered starts (0.5s apart)
-    scale = 0.5 if "GITHUB_ACTIONS" not in os.environ else 10
     tasks = {
-        username: get_token_with_delay(username, config, idx * scale)
+        username: get_token_with_delay(username, config, idx * 0.5)
         for idx, (username, config) in enumerate(test_users_setup.items())
     }
 
diff --git a/uv.lock b/uv.lock
index 21d1c86..75b9876 100644
--- a/uv.lock
+++ b/uv.lock
@@ -650,6 +650,7 @@ dev = [
     { name = "pytest" },
     { name = "pytest-cov" },
     { name = "pytest-playwright-asyncio" },
+    { name = "pytest-timeout" },
     { name = "ruff" },
 ]
 
@@ -672,6 +673,7 @@ dev = [
     { name = "pytest", specifier = ">=8.3.5" },
     { name = "pytest-cov", specifier = ">=6.1.1" },
     { name = "pytest-playwright-asyncio", specifier = ">=0.7.1" },
+    { name = "pytest-timeout", specifier = ">=2.3.1" },
     { name = "ruff", specifier = ">=0.11.13" },
 ]
 
@@ -1037,6 +1039,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/94/1e/f71a3131bb03a57631d77a47cebba93b694033759f69f08a6f06c375fc30/pytest_playwright_asyncio-0.7.1-py3-none-any.whl", hash = "sha256:1cc25aed49879161cc1b1aa0f9e1a3d36d9ebdde412b6e5074440d71dc0d87e3", size = 16963, upload-time = "2025-09-08T08:10:56.788Z" },
 ]
 
+[[package]]
+name = "pytest-timeout"
+version = "2.4.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ac/82/4c9ecabab13363e72d880f2fb504c5f750433b2b6f16e99f4ec21ada284c/pytest_timeout-2.4.0.tar.gz", hash = "sha256:7e68e90b01f9eff71332b25001f85c75495fc4e3a836701876183c4bcfd0540a", size = 17973, upload-time = "2025-05-05T19:44:34.99Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fa/b6/3127540ecdf1464a00e5a01ee60a1b09175f6913f0644ac748494d9c4b21/pytest_timeout-2.4.0-py3-none-any.whl", hash = "sha256:c42667e5cdadb151aeb5b26d114aff6bdf5a907f176a007a30b940d3d865b5c2", size = 14382, upload-time = "2025-05-05T19:44:33.502Z" },
+]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"